7583 Commits

Author SHA1 Message Date
Alex Klyubin
fd445e0336 Merge "Add PSKKeyManager to enable the use of TLS-PSK." 2014-06-17 04:56:28 +00:00
Robin Lee
b12f1778d6 Merge "Publish DevicePolicyManager CA certificate APIs" 2014-06-17 05:12:50 +00:00
Richard Coles
2995606963 Merge "Connect WebView Async Cookie APIs" 2014-06-17 05:13:46 +00:00
Hector Dearman
24a11d311c Connect WebView Async Cookie APIs
Bug: 14379829
Change-Id: I6b0e0644153a805eccb48d30b0ad3e91babd8093
2014-06-17 15:32:07 +01:00
Jae Seo
cf9bec5bb6 TvContract: Enable building programs URI also with channel ID
Bug: 15446137
Change-Id: I322c1b90c272e553b028af1f9011feecde124915
2014-06-16 17:55:32 -07:00
Robin Lee
837304f6f6 Publish DevicePolicyManager CA certificate APIs
Exposes these methods:
 - hasCaCertInstalled
 - hasAnyCaCertsInstalled
 - installCaCert
 - uninstallCaCert

Allows device and profile owners to perform some certificate management
including querying for and enabling/disabling specific CA certificates.

Change-Id: I4aa8a1a8601b234e30acde99dfa382e04cb62495
2014-06-11 16:55:32 +01:00
Yorke Lee
3e960affb2 Merge "Add TelecommManager to system services" 2014-06-16 20:54:41 +00:00
Yorke Lee
b4ce1432c6 Add TelecommManager to system services
Change-Id: I48a75c578a99aca1149fbae84a5d0f9ac0a457f3
2014-06-16 14:41:50 -07:00
Elliott Hughes
bc6d140313 am 8f20914b: Merge "@hide." into lmp-preview-dev
* commit '8f20914b08607b85eabe5ea5701a3e144493b25b':
  @hide.
2014-06-16 20:58:04 +00:00
Elliott Hughes
f9fd6a7dfc @hide.
Change-Id: Ieacf34a7b850910e70ae54f738608509e2c39e2e
2014-06-16 20:15:44 +00:00
Adam Powell
c5f83d0c3f Merge "Add TextView#set/getShowSoftInputOnFocus" 2014-06-16 15:39:47 +00:00
Adam Powell
206c6e85ab Add TextView#set/getShowSoftInputOnFocus
These APIs allow an application to suppress the default editable
TextView focus gain behavior of displaying the IME. Useful in cases
where an app provides an alternate way of entering content, such as a
dialpad or calculator pad.

Bug 11540727

Change-Id: I1abd98db6e1522a9655a42b6ee712f50a962ea00
2014-06-16 12:57:16 -07:00
Yorke Lee
0612d3dfe4 Merge "Add ability to set and get DefaultPhoneApplication" 2014-06-16 19:03:13 +00:00
Yorke Lee
2e024708b1 Add ability to set and get DefaultPhoneApplication
Change-Id: I8aa8cb16965106175c538f36915a31cf4830cef2
2014-06-16 10:42:59 -07:00
Selim Gurun
1b6e10bcca Unhide the file API
Bug: 6930981
Change-Id: I4818d5dff3cb05b38e4d8f9f817e4fcdeade7f00
2014-06-16 11:52:05 -07:00
ztenghui
7cd8ec237b Merge "Make ViewAnimationUtils final" 2014-06-16 15:39:47 +00:00
ztenghui
1c2ebed64b Make ViewAnimationUtils final
Change-Id: I356586c77e8a495709e5a99c8b51620b82d9fbac
2014-06-12 13:51:10 -07:00
Selim Gurun
4473427f85 Merge "Address the API review" into lmp-preview-dev 2014-06-12 05:34:42 +00:00
Selim Gurun
ee89ab4dd5 Address the API review
Bug: 15432556

The api council asks to change the interface to an abstract class
and clarify the clearClientCertPreferences api. This change addresses
these.

Change-Id: I7979788c7c041bacbfef5ea4d94309f91279ef22
2014-06-13 10:53:55 -07:00
Ihab Awad
647e2c6825 Merge "DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (1/4)" 2014-06-13 21:09:46 +00:00
Ihab Awad
c067754a85 DO NOT MERGE. Port "respond via SMS message" feature to new Telecomm. (1/4)
Bug: 15275904
Bug: 15196474
Change-Id: If9aeae519047b221aa2c178d8d2903c4e2054a6d
2014-06-13 18:05:29 -07:00
Zhijun He
0cb41fd5ad Merge "Camera2: Add rollingShutterSkew tag" 2014-06-13 21:09:46 +00:00
Zhijun He
0bda31afe0 Camera2: Add rollingShutterSkew tag
Change-Id: Icbedaeda9fc64a9dda509493ad9d14569c56cd18
2014-06-13 14:38:39 -07:00
Selim Gurun
4ffd507e67 am a5aa4b48: Merge "Address the API review" into lmp-preview-dev
* commit 'a5aa4b4879761a93c936303cf5c34d499aa0fe76':
  Address the API review
2014-06-13 19:25:35 +00:00
Przemyslaw Szczepaniak
e31ab2d8fc Merge "Expose "default tts locale" to the TTS V2 API." 2014-06-11 15:57:38 +00:00
Przemyslaw Szczepaniak
1b5637ee32 Expose "default tts locale" to the TTS V2 API.
This change allows TTS V2 API client applications to honor the
"default TTS locale" set by the user in the TTS settings.

Note that the TTS V1 API uses 3 character country/language codes
for locale encoding. It's the only system component that does
that. TTS V2 uses the standard, valid Locale objects. The default
TTS locale setting was stored as a 3 character locale string with
"-" as the separator.

This change switches the TTS locale setting format to the output of
Locale.toString() call (on a valid Locale object). Methods used for
reading this value can interpret both forms and try to return a valid
Locale object as an output.

Change-Id: Ice2e6c25a43eb9dd6e17d371ee582c2dae3329c9
2014-06-11 13:49:48 +01:00
Zhijun He
5eaf6d2161 Merge "Camera2: Add timestampCalibration tag" 2014-06-13 21:09:46 +00:00
Zhijun He
45fa43a181 Camera2: Add timestampCalibration tag
Also update the video/optical stabilization docs.

Change-Id: I444cc8d46c0a460bc4311e58bf6166b5c6dbfd14
2014-06-13 18:29:37 -07:00
Adrian Roos
e74b853d9f resolved conflict for merge of 3ca33b70 to master
Change-Id: I5226015ca7cef030586349cc698a46e458ac788e
2014-06-11 15:02:55 +02:00
Jae Seo
cf5085bd49 Merge "Add channel types for NTSC, PAL and SECAM" 2014-06-12 05:34:42 +00:00
Jae Seo
3a0f19980d Add channel types for NTSC, PAL and SECAM
Bug: 14451655, Bug: 15321686
Change-Id: I2618fb79a4b20898c95cea22154379738710da44
2014-06-11 18:25:11 -07:00
Dan Sandler
069438d3fe am 54c4c19b: Merge "NotificationListenerService: API updates" into lmp-preview-dev
* commit '54c4c19bc95e839cfce3d10f0e842ed5588391eb':
  NotificationListenerService: API updates
2014-06-12 00:04:01 +00:00
Sandeep Siddhartha
2adb5bdc93 Fix build break
The previously generated IDs were somehow off by one. I guess after I
did update-api someone else did that, and then I submitted my change

Change-Id: I276a7cdd72f067e46cb7bad625a9f4053c377dc5
2014-06-11 20:23:07 -07:00
Sandeep Siddhartha
297c2daabd Merge "Activity for enrollment" 2014-06-11 21:23:31 +00:00
Sandeep Siddhartha
22968950b8 Activity for enrollment
- Make the enrollment attrs public
- Add a dummy activity for enrollment

- Manually tested that the meta-data is correctly read by the
  VoiceInteractionService when the enrollment application is under
  /system/priv-app

Change-Id: I36676ed8ffc919109031c26bac047d0c51a77e13
2014-06-11 15:34:39 -07:00
Jean-Michel Trivi
5052e78949 Merge "AudioManager: add ability to allocate a new session ID" 2014-06-10 21:49:59 +00:00
George Mount
e089d06151 Merge "Allow enter activity transitions to be delayed until data is ready." 2014-06-10 22:06:31 +00:00
George Mount
8c2614ce43 Allow enter activity transitions to be delayed until data is ready.
Bug 15539194

Change-Id: I8de9806b0bcdf8129eb3b5a555a2433f0c7be634
2014-06-10 17:03:43 -07:00
Zhijun He
5f0d640c02 Merge "CamcorderProfiles: Add 4K video constants" 2014-06-10 21:44:22 +00:00
Christopher Tate
70c1de2072 am 40c042b8: Merge "Hide the (obsolescent) android.app.maintenance APIs" into lmp-preview-dev
* commit '40c042b884696d162468d971630c48eebd84475b':
  Hide the (obsolescent) android.app.maintenance APIs
2014-06-11 17:43:20 +00:00
Christopher Tate
0188bee2c5 am d8f71d34: Merge "Out with the old; in with the new" into lmp-preview-dev
* commit 'd8f71d34c3c7fb161a1586de8edb52161c32d672':
  Out with the old; in with the new
2014-06-11 17:02:18 +00:00
Zhijun He
e414608cb3 CamcorderProfiles: Add 4K video constants
Bug: 15287656
Change-Id: Ifbd9d37fb775371e2a4ee5cf80abbf83a75ffd65
2014-06-10 22:16:41 +00:00
Christopher Tate
863d8af75a Hide the (obsolescent) android.app.maintenance APIs
Bug 14994893

Change-Id: If3c06de006504e81c37eb6b716d613e5124d28bc
2014-06-10 18:20:24 -07:00
Paul Jensen
0a363a319f Apply API review to android.net.Network:
- socketFactory() renamed to getSocketFactory()
- Make sure bindProcess() documentation points developers to getSocketFactory() as the preferred approach
- Move bindProcess() and unbindProcess() to ConnectivityManager.setProcessBoundNetwork() -- passing null clears it.
- Move getProcessBoundNetwork() to ConnectivityManager.getProcessBoundNetwork().

Bug:15142362
Bug:13885501

Change-Id: Ia55c59d52e1ec8bf10dd0d9d037bd04c0998bc71
(cherry picked from commit 5ca1e6675bf4182b6e9ca76a7696bf2e38e96c4f)
2014-06-10 22:26:11 +00:00
Christoph Studer
d0694b6735 NotificationListenerService: API updates
Introduce RankingMap holding single notification Rankings
indexed by SBN keys.

Also, pass RankingMap with notification event callbacks so
subclasses don't have to call getCurrentRanking() unnecessarily.

Bug: 15415840
Change-Id: Id41e174f00c06c86359c03646abc3db78028b324
2014-06-11 18:27:18 +02:00
George Mount
a035b56271 Merge "DO NOT MERGE Allow enter activity transitions to be delayed until data is ready." into lmp-preview-dev 2014-06-10 21:44:22 +00:00
George Mount
28a8d10805 DO NOT MERGE Allow enter activity transitions to be delayed until data is ready.
Bug 15539194

Change-Id: I8de9806b0bcdf8129eb3b5a555a2433f0c7be634
2014-06-10 17:06:34 -07:00
Alex Klyubin
b0d1d91407 Add PSKKeyManager to enable the use of TLS-PSK.
TLS-PSK is supported by the underlying TLS/SSL stack (based on
Conscrypt). This CL simply exposes this support in the Android
framework.

TLS-PSK is a set of TLS/SSL cipher suites which rely on a symmetric
pre-shared key (PSK) to secure the TLS/SSL connection and mutually
authenticate its peers. These cipher suites may be a more natural fit
compared to conventional public key based cipher suites in some
scenarios where communication between peers is bootstrapped via a
separate step (for example, a pairing step) and requires both peers
to authenticate each other. In such scenarios a symmetric key (PSK)
can be exchanged during the bootstrapping step, removing the need to
generate and exchange public key pairs and X.509 certificates.

Bug: 15073623
Change-Id: Idf2a773db3021de3d2ad144c5cc63d2415eb8e91
2014-06-10 14:30:56 -07:00
Sreeram Ramachandran
cc91c7b804 Add a new IpPrefix class and use it in RouteInfo.
This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.

Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.

Bug: 15142362
Bug: 13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e
2014-06-10 14:30:15 -07:00
Christopher Tate
e9ed3707b2 Merge "Out with the old; in with the new" into lmp-preview-dev 2014-06-10 21:27:54 +00:00