Commit Graph

37488 Commits

Author SHA1 Message Date
Robin Lee
2b5e917026 Revert "Publish DevicePolicyManager CA certificate APIs"
This reverts commit 5260bf69946563dc47c17e7441b352adfce384c5.

Change-Id: I5e44fdac8a7375576b25171f58e31a1fa0e3c569
2014-06-17 22:12:28 +00: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
Jorim Jaggi
e6cad8027c am 5eb62efd: Merge "Do not override mColor with default color if none set" into lmp-preview-dev
* commit '5eb62efd935399335ee2504a483900c69a45494a':
  Do not override mColor with default color if none set
2014-06-11 12:41:45 +00:00
Nicolas Prevot
0cc9c1e9d3 Merge "Changing the value of the user consent extra in DevicePolicyManager." 2014-06-10 21:31:35 +00:00
Robert Greenwalt
f8333cc381 Merge "Minor changes to the LinkAddress API docs." 2014-06-10 21:59:55 +00:00
Robert Greenwalt
78802575ac Merge "Add a new IpPrefix class and use it in RouteInfo." 2014-06-10 22:12:51 +00:00
Selim Gurun
1ac3e017d4 Merge "Add WebChromeClient.showFileChooser" 2014-06-10 22:13:32 +00:00
Lorenzo Colitti
7dc78cf3af Minor changes to the LinkAddress API docs.
1. Rename getNetworkPrefixLength to getPrefixLength. Update all
   callers in frameworks/base and add a shim method and a TODO
   for the rest.
2. @hide isSameAddressAs. It doesn't add much, and it's just
   one-liner that callers can implement if they want.
3. Fix the alignment of the initial paragraph (<ul> should have
   been </ul>).
4. Remove the documentation that talks about creating
   LinkAddresses, since there's no public API for creating them.

With these changes I think LinkAddress is fine as a public API.

Bug: 15142362
Change-Id: Iaf3b1db577745bb68a9e1dd7f96d666dd3f3ec7c
2014-06-10 14:46:39 -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
Jonathan Dixon
3a5cf3876c Add WebChromeClient.showFileChooser
Bug: 6930981

This replaces the never-published openFileChooser, and is more future
extensible.
Currently hidden; will unhide once working end to end and tested.

Change-Id: Ie66750be37e5b90e4a411cec76278369dc8dabe8
2014-06-10 13:58:07 -07:00
Jorim Jaggi
598622df8c Merge "Do not override mColor with default color if none set" into lmp-preview-dev 2014-06-10 20:03:23 +00:00
Jorim Jaggi
7441931462 Do not override mColor with default color if none set
Bug: 15163105
Change-Id: Ibb9507b24aeaae7a571d42eb411aff25449d48fe
2014-06-10 20:57:21 +02:00
Matthew Williams
7b5c2340ad am e389d1ea: Merge "Remove SyncRequest.setPriority from public API" into lmp-preview-dev
* commit 'e389d1ea63b0a9caa6d069254ac661ca6420917f':
  Remove SyncRequest.setPriority from public API
2014-06-10 18:05:41 +00:00
Doug Zongker
40e53cdc94 Merge "hide RECOVERY permission from L preview -- DO NOT MERGE" into lmp-preview-dev 2014-06-10 17:38:20 +00:00
Igor Murashkin
f1d758867a am 69729adf: Merge "camera2: Fix session-related CTS test failures" into lmp-preview-dev
* commit '69729adf04bddb2e5b67d625412151b4bcbc1ca4':
  camera2: Fix session-related CTS test failures
2014-06-10 17:22:22 +00:00
Craig Mautner
7683baad6c am a7c5791a: Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev
* commit 'a7c5791a95bf732c2381f698d78930ee61efd36b':
  Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK
2014-06-10 17:21:52 +00:00
Nicolas Prevot
fb8a98d3f3 Changing the value of the user consent extra in DevicePolicyManager.
Renaming android.app.action.USER_HAS_CONSENTED to
android.app.action.ACTION_PROVISIONING_USER_HAS_CONSENTED

Change-Id: I65a3b8f1ec29a0bed5b61ff9e7587195e1c96cec
2014-06-10 17:59:27 +01:00
Matthew Williams
c2c1a39510 Merge "Remove SyncRequest.setPriority from public API" into lmp-preview-dev 2014-06-10 15:50:11 +00:00
Matthew Williams
f53c295ae3 am 3b471117: Merge "Add OnNetworkActive to TaskManager and simplify locking." into lmp-preview-dev
* commit '3b4711176e77640d697e94137e65fa93c8363f5c':
  Add OnNetworkActive to TaskManager and simplify locking.
2014-06-10 14:55:46 +00:00
John Reck
1a2f7a1e29 resolved conflicts for merge of 2d2aa0cc to master
Change-Id: Ib7bb0e40569a8f6a7f856eef54980d70d9769cdc
2014-06-10 07:53:03 -07:00
Jeff Sharkey
d734c698e3 am 99f4fe07: Merge "Refactor directory API to "opening document tree."" into lmp-preview-dev
* commit '99f4fe0797adb8350f92c7d1ba11776d1947e768':
  Refactor directory API to "opening document tree."
2014-06-10 11:18:54 +00:00
Xiaolei Wang
b71f764c28 am c686a0d4: Merge "Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a" into lmp-preview-dev
* commit 'c686a0d4b116654d6bec3ff7d5443f8da3ffb20a':
  Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a
2014-06-10 11:18:48 +00:00
Alan Viverette
4a00c53800 am 5d5de3ee: Merge "Use a weak reference to the ObjectAnimator target" into lmp-preview-dev
* commit '5d5de3ee32302ae45f3a01933997a2b838bf6291':
  Use a weak reference to the ObjectAnimator target
2014-06-10 11:18:30 +00:00
Adam Connors
ac383e52a9 DO NOT MERGE : Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only.
And update the javadoc to explain use-case.

Bug: 15025562
Change-Id: I8eb2666c8480f873e042687223b1a1f82e7919c9
2014-06-10 10:24:14 +00:00
Yohei Yukawa
2f4bd692d3 Merge "Use more user actions to update the IME rotation order" 2014-06-10 09:33:13 +00:00
Kenny Guy
ef2b37ea87 Merge "Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only." 2014-06-10 08:55:47 +00:00
Igor Murashkin
3721cbaf01 Merge "camera2: Fix session-related CTS test failures" into lmp-preview-dev 2014-06-10 04:02:28 +00:00
Matthew Williams
2368014073 Remove SyncRequest.setPriority from public API
Bug: 15517262
Change-Id: If62b6f3bf339011dd504889aa24c71a22cb08ed8
2014-06-09 20:18:25 -07:00
Justin Koh
0c4122c9b5 am ce8c1086: am eba8782a: Add NPE check to getSystemWindowInsets
* commit 'ce8c1086fbc42e80056b59d9dbbd6144cb85f20d':
  Add NPE check to getSystemWindowInsets
2014-06-10 01:30:21 +00:00
Justin Koh
36b0cae955 am 2be4ddc4: am a5de8479: Merge "Fix Browser when running on a platform without webview" into klp-modular-dev
* commit '2be4ddc403b55e3c5107609a2eaeed4ddc0f23f0':
  Fix Browser when running on a platform without webview
2014-06-10 01:30:16 +00:00
Craig Mautner
df8e542a8a Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev 2014-06-10 01:29:43 +00:00
Craig Mautner
f357c0ca51 Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK
Change definition of FLAG_ACTIVITY_NEW_DOCUMENT from
FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET to
FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET alone.

Also add new documentLaunchMode of "never" to allow activity
writers to keep their activity from being launched in document mode.

Fixes bug 15468528.

Change-Id: Ied11adf97e85c5d3f99f4c0bbbb4a2905dcfb24e
2014-06-09 18:09:33 -07:00
Igor Murashkin
e1442204c1 camera2: Fix session-related CTS test failures
Bug: 15474402
Change-Id: I4ae86166b5ce99a854c754c8ac6d6c23c683b14a
2014-06-09 17:51:24 -07:00
Matthew Williams
5553aeb2ae Merge "Add OnNetworkActive to TaskManager and simplify locking." into lmp-preview-dev 2014-06-10 00:24:05 +00:00
Matthew Williams
effacfa75b Add OnNetworkActive to TaskManager and simplify locking.
Bug: 14993295
Hooks up a ConnectivityManager.NetworkActiveListener.
    
Previously was using 3 locks where 1 would suffice,
negligible to no performance issues b/c most of the previous locks
were nested.

Added OnNetworkActiveListener so that the ConnectivityController can kick of
tasks when it knows that the network is active.

Fixed some bugs that stopped timecontroller from executing tasks.

Requesting a retry will not add a deadline to that task. However backed-off
tasks are run as soon as they are ready, subject to their constraints.

Added receiver to listen for package removal and user removal, which will
delete any outstanding jobs for that uid.

Change-Id: I4c4523af558b927f19b8a215878fcc7198abb93f
2014-06-09 17:18:11 -07:00
Jinsuk Kim
e44e754166 Merge "Tag HdmiControlService API classes with @hide/@SystemApi" into lmp-preview-dev 2014-06-10 00:11:20 +00:00
Jeff Sharkey
f8f69b899f Merge "Refactor directory API to "opening document tree."" into lmp-preview-dev 2014-06-10 00:10:28 +00:00
Xiaolei Wang
2641ab276c Merge "Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a" into lmp-preview-dev 2014-06-10 00:09:38 +00:00
Jeff Sharkey
b9fbb7290b Refactor directory API to "opening document tree."
Cleans up API so it consistently refers to opening or working with a
subtree of documents.  Also separates isChildDocument() support from
the concept of directory tree selection.

Bug: 15429194
Change-Id: Ice66a751ff4bd0cc4d34c44c5da13a0dc4186dc9
2014-06-09 17:07:58 -07:00
Jinsuk Kim
66d1eb285b Tag HdmiControlService API classes with @hide/@SystemApi
Bug: 15516329, Bug: 15516710
Change-Id: Ie814513a642660b6c5fdc9e891ad1eec1b2d689b
2014-06-09 23:49:21 +00:00
Alan Viverette
fc9f55ae12 Merge "Use a weak reference to the ObjectAnimator target" into lmp-preview-dev 2014-06-09 22:58:13 +00:00
vandwalle
6123315ad4 Merge "remember and report network score" 2014-06-09 22:30:26 +00:00
Xiaolei Wang
b2b2ac1287 Add constants to Android TV On Device Search.
Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a
2014-06-09 15:07:17 -07:00
Doug Zongker
c302e4d32f hide RECOVERY permission from L preview -- DO NOT MERGE
Bug: 15516323
Change-Id: I16a6355f631523919607bd111e5ebfe16fa4506e
2014-06-09 15:04:38 -07:00
vandwalle
2ab9089dfa remember and report network score
Change-Id: Iccb2ec603bc9c0d3cf1976d0cc3f343cb1096494
2014-06-09 14:50:47 -07:00
Jeff Brown
5c507c1371 Rename PrivateApi annotation to SystemApi. (DO NOT MERGE)
Change-Id: I97b473884f81ad375d0733e4766afe091dfdd854
2014-06-09 14:28:11 -07:00
Justin Koh
ce8c1086fb am eba8782a: Add NPE check to getSystemWindowInsets
* commit 'eba8782a1f8412a3510fc78a71b843ef6e89bdbb':
  Add NPE check to getSystemWindowInsets
2014-06-09 21:12:39 +00:00
Justin Koh
2be4ddc403 am a5de8479: Merge "Fix Browser when running on a platform without webview" into klp-modular-dev
* commit 'a5de8479f442b7e6f8d285db58713e42fb922798':
  Fix Browser when running on a platform without webview
2014-06-09 21:12:35 +00:00
Daniel Sandler
d343aff26d am e7078cf9: Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
* commit 'e7078cf9c41f5e3581a80b2129ae77719b0f69a4':
  Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
2014-06-09 19:28:56 +00:00
Justin Koh
eba8782a1f Add NPE check to getSystemWindowInsets
Bug: 15452706
Change-Id: Ica83593eadd0155e1370dba268a9f15ad0affa7d
2014-06-09 11:31:53 -07:00