Commit Graph

52492 Commits

Author SHA1 Message Date
Jorim Jaggi
db97569ef8 am 7d01d2c6: Merge "Fix API review: Camera prewarm" into mnc-dev
* commit '7d01d2c6cfcdfad74735619ab95f8396be54dc0f':
  Fix API review: Camera prewarm
  lock device orientation during app compatibility test
  Fix reconfigure & setPremult alpha handling
  Unflip TextureView getBitmap readback
  Handle error states when refreshing accessibility node
2015-06-02 22:39:39 +00:00
Jorim Jaggi
03d6e3284d am 11accf51: Merge "Make sure starting windows only draw once" into mnc-dev
* commit '11accf51c2e5b3e4fcfc3d61e9b8a46c1ce0284a':
  Make sure starting windows only draw once
2015-06-02 22:39:34 +00:00
Jorim Jaggi
7d01d2c6cf Merge "Fix API review: Camera prewarm" into mnc-dev 2015-06-02 22:25:29 +00:00
Jorim Jaggi
11accf51c2 Merge "Make sure starting windows only draw once" into mnc-dev 2015-06-02 22:24:48 +00:00
Nicolas Prevot
d0e22281be am db6ac0e9: Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev
* commit 'db6ac0e912ee935f848b4d5bede02f1f6df9e3e2':
  Make ACTION_PROVISION_MANAGED_DEVICE public.
2015-06-02 22:17:01 +00:00
Svetoslav
87b52622e0 am 3aa3f5f8: Merge "Fix java doc" into mnc-dev
* commit '3aa3f5f892017f8a3799278c0cee8773dd4c5a0f':
  Fix java doc
2015-06-02 22:16:55 +00:00
Nicolas Prevot
db6ac0e912 Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev 2015-06-02 22:11:11 +00:00
Svetoslav
3aa3f5f892 Merge "Fix java doc" into mnc-dev 2015-06-02 22:09:18 +00:00
Svetoslav
aa048b6242 Fix java doc
Change-Id: I927a1766e1e4cac99d0d7999fef568b82af769af
2015-06-02 15:08:48 -07:00
Svetoslav
f73b0d0998 am c5ff0020: Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev
* commit 'c5ff0020a2467e0b7aed590d790b5a1b4b082f56':
  Add API to hint whether to show on-board UI before a permission request.
2015-06-02 22:02:23 +00:00
Svetoslav
c5ff0020a2 Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev 2015-06-02 21:53:20 +00:00
Svetoslav
20770ddbd4 Add API to hint whether to show on-board UI before a permission request.
bug:21511988

Change-Id: I9d1d7adf34b68074e65510f53b6e642cf784cf6b
2015-06-02 14:48:38 -07:00
Brian Attwell
8d67e2db1c am b36ad5dc: Decouple ProviderStatus & internal provider state
* commit 'b36ad5dc6bb6218aeabca17197001ac0a942219a':
  Decouple ProviderStatus & internal provider state
2015-06-02 21:04:59 +00:00
Nicolas Prevot
64bf7b2870 Make ACTION_PROVISION_MANAGED_DEVICE public.
Also remove the doc saying that factory reset is impossible if there
is a device owner: the device owner may not set the user restriciton
DISALLOW_FACTORY_RESET.

BUG:19889110

Change-Id: Iadc084a38e541061c0b0c95bfc95da73d48842d7
2015-06-02 14:04:41 -07:00
Brian Attwell
b36ad5dc6b Decouple ProviderStatus & internal provider state
Bug: 21090207
Change-Id: I7e93e36ad0c0d667ac56983c76acb1b97bd8755c
2015-06-02 20:56:27 +00:00
Amith Yamasani
b719a46257 am ff3b76d0: Merge "Temporarily whitelist an app for network during doze" into mnc-dev
* commit 'ff3b76d04672d09214cd0ceb29ec548c8abb2330':
  Temporarily whitelist an app for network during doze
2015-06-02 20:46:58 +00:00
Amith Yamasani
ff3b76d046 Merge "Temporarily whitelist an app for network during doze" into mnc-dev 2015-06-02 20:34:59 +00:00
Robin Lee
bfcd008382 am 02a400ca: Merge "Device policy: consistent javadoc and annotations" into mnc-dev
* commit '02a400ca6e5a185906b743c379716f9315e03bb2':
  Device policy: consistent javadoc and annotations
2015-06-02 20:00:44 +00:00
Robin Lee
02a400ca6e Merge "Device policy: consistent javadoc and annotations" into mnc-dev 2015-06-02 19:53:41 +00:00
Wale Ogunwale
a7d447dfde am c9a04522: Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev
* commit 'c9a0452244420b910ca3294f043f34ccc6a6044c':
  @hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.
2015-06-02 19:11:10 +00:00
Robin Lee
25e264507c Device policy: consistent javadoc and annotations
Annotated all uses of the ComponentName parameter to methods in
DevicePolicyManager to indicate whether null is acceptable.

Deleted/fixed some inconsistent or poorly-worded documentation.

Bug: 21422939
Change-Id: Iadfa78c5170bf4899a9daaf93c3d4e9d8b170a45
2015-06-02 11:55:21 -07:00
Wale Ogunwale
c9a0452244 Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev 2015-06-02 18:54:55 +00:00
Jorim Jaggi
a16cc15f6c Make sure starting windows only draw once
The panel menu was invalidated, and thus a runnable was posted for
the next frame, to update the panel menu, and invalidate the view. We
avoid this by not invalidating the panel menu for starting windows.

Bug: 20949632
Change-Id: I67ca47e3a7ce3ba1d685c2313efa66fb1cdee312
2015-06-02 18:35:56 +00:00
Robin Lee
cd4aa78063 am f4d9ecc5: Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev
* commit 'f4d9ecc503e7e849ff37a4674680c7213d819592':
  Revert "Consistent documentation and annotations for DPMS"
2015-06-02 18:29:57 +00:00
Robin Lee
cf1180c7dc am 5de95550: Merge "Consistent documentation and annotations for DPMS" into mnc-dev
* commit '5de95550b7741bfd7d4da54ea562afb8bb328397':
  Consistent documentation and annotations for DPMS
2015-06-02 18:29:53 +00:00
Robin Lee
f4d9ecc503 Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev 2015-06-02 18:25:43 +00:00
Robin Lee
49ec19ef6c Revert "Consistent documentation and annotations for DPMS"
This reverts commit 695142a17a.

Change-Id: Iaa2abe7e8bcecc5177a395b0dab8f66cc7100d3d
2015-06-02 18:25:28 +00:00
Robin Lee
5de95550b7 Merge "Consistent documentation and annotations for DPMS" into mnc-dev 2015-06-02 18:16:26 +00:00
Robin Lee
695142a17a Consistent documentation and annotations for DPMS
Annotated all uses of the ComponentName parameter to methods in
DevicePolicyManager to indicate whether null is acceptable.

Deleted or fixed some inconsistent or poorly-worded documentation.

Bug: 21422939
Change-Id: I8d86d0968c2af3595f268828ea1625f1ed256d50
2015-06-02 11:15:34 -07:00
Wale Ogunwale
3540f93654 @hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.
Bug: 21572285
Change-Id: Iff56a8ee5b91e02bd20afb7891bd94a0ec1abba9
2015-06-02 11:07:07 -07:00
Amith Yamasani
af575b9f8e Temporarily whitelist an app for network during doze
API to allow an app to be whitelisted for network and wakelock
access for a short period. So even if the device is in idle
mode, such apps can be given a chance to download the payload
related to a high priority cloud-to-device message.

This API is meant for system apps only.

A new permission CHANGE_DEVICE_IDLE_TEMP_WHITELIST is required
to make this call.

Bug: 21525864
Change-Id: Id7a761a664f21af5d7ff55aa56e8df98d15511ca
2015-06-02 11:05:03 -07:00
Carlos Valdivia
6a316046e8 am 2ed6369c: Merge "System Health: Support expiring tokens" into mnc-dev
* commit '2ed6369c5d856aa2e1f9972d52f0f3c2526c713a':
  System Health: Support expiring tokens
2015-06-02 17:35:49 +00:00
Wei Wang
6ff99d9faa am 6f54da32: Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev
* commit '6f54da32c9c5c766ba15a6e9cc4be0c27276fc68':
  Expose a few system APIs for BLE scan only mode.
2015-06-02 17:35:39 +00:00
Carlos Valdivia
2ed6369c5d Merge "System Health: Support expiring tokens" into mnc-dev 2015-06-02 17:31:29 +00:00
Wei Wang
6f54da32c9 Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev 2015-06-02 17:24:00 +00:00
Wei Wang
f9e3e9e3dd Expose a few system APIs for BLE scan only mode.
Bug: 21562349
Change-Id: Ifc58efcf01edac5b4f9e5266adb966e7bc492209
2015-06-02 10:22:20 -07:00
Carlos Valdivia
91979be880 System Health: Support expiring tokens
In the past android:customTokens=true authenticators were required to handle
their own token caching. This is detrimental for battery when high traffic
authenticators are constantly spinning up processes to start services to do
file io to check their own caches.  This change allows authenticator
implementers to optionally let the framework do some of the work for them by
providing the framework with a expiration time.

The AccountManagerService will make a best effort to re-use the cached
token if possible.

Bug: 21530782

Change-Id: I16a7edba36a220e3891e55cf61c725c2be863323
2015-06-02 09:58:18 -07:00
Svet Ganov
9cd64f0d07 am 8fa8b95c: Merge "Respect accessibility importance for before/after node ordering." into mnc-dev
* commit '8fa8b95c9d38183497f08efc6bdf4d2c56a4116c':
  Respect accessibility importance for before/after node ordering.
2015-06-02 16:57:13 +00:00
Alan Viverette
1ac5554feb am 54310008: Merge "Remove strict mode violation from value to string coercion" into mnc-dev
* commit '5431000830551959db15038da8f057c2e993d01a':
  Remove strict mode violation from value to string coercion
2015-06-02 16:57:08 +00:00
Svet Ganov
8fa8b95c9d Merge "Respect accessibility importance for before/after node ordering." into mnc-dev 2015-06-02 16:49:47 +00:00
Alan Viverette
5431000830 Merge "Remove strict mode violation from value to string coercion" into mnc-dev 2015-06-02 16:47:53 +00:00
Svet Ganov
2dca7ca9bf Respect accessibility importance for before/after node ordering.
One can set a view to be visited before/after another one for
accessibility but the before/after target views were always added
to the node info for the view regardless if they are included
for accessiilbity. Now the target viwes are reported only if they
should be included for accessibility.

Change-Id: Iba64e6f0ee0dc090c8c3e6a0a940df8c7ecd49d9
2015-06-02 09:45:19 -07:00
Nitin Shivpure
f9b66d0af8 am 1f8b8448: Bluetooth: Fix to avoid framework reboot during monkey testing
* commit '1f8b844870eb9acb334b541b0b41de37e000d2f0':
  Bluetooth: Fix to avoid framework reboot during monkey testing
2015-06-02 15:14:30 +00:00
Andre Eisenbach
2b656bc139 am 708f57f4: Un-hide connectGatt() variant with selective transport
* commit '708f57f4dc34587cd9a0b507fda20555a94c4755':
  Un-hide connectGatt() variant with selective transport
2015-06-02 15:13:34 +00:00
Ruben Brunk
8ea83c383e am 11df5b66: Merge "Track camera and flashlight usage in battery stats." into mnc-dev
* commit '11df5b66ef621c4d67f5b4980e879784de43fd70':
  Track camera and flashlight usage in battery stats.
2015-06-02 15:13:26 +00:00
Clara Bayarri
2d2bf8ad0f am a0b77dd5: Merge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev
* commit 'a0b77dd5e2a6011291810db392be0981ed73aa97':
  Fix TextView ActionMode overflow finishes the ActionMode
2015-06-02 15:13:07 +00:00
Clara Bayarri
3c1253df52 am d63a1776: Merge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev
* commit 'd63a177670a5f459f3380daff32e4561b0d5d26c':
  Make Text Selection Action Mode secondary items IF_ROOM
2015-06-02 15:13:02 +00:00
Adam Powell
fbb34a16ef am fa3f17f1: Merge "Don\'t take the compatibility path for non-primary ActionModes" into mnc-dev
* commit 'fa3f17f117c6ce04e60b2e38b22e2c1c6ec34072':
  Don't take the compatibility path for non-primary ActionModes
2015-06-02 15:12:56 +00:00
Svetoslav
6200f5f781 am 4982e7b4: Merge "Don\'t add real children for a view with a node provider" into mnc-dev
* commit '4982e7b4dce8afe2a5490ac6a6630039946b782f':
  Don't add real children for a view with a node provider
2015-06-02 15:12:28 +00:00
Jorim Jaggi
9988fb897a am 03a7c4c6: Fix shared drawable state
* commit '03a7c4c6d4f30416b3fa6e9018f098c0fa41bbd5':
  Fix shared drawable state
2015-06-02 15:11:58 +00:00