Jorim Jaggi
ecfeefb483
am f7f90276: am 7d01d2c6: Merge "Fix API review: Camera prewarm" into mnc-dev
...
* commit 'f7f90276a1f262c0db855edc49d544e157bc6e7f':
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:49:06 +00:00
Jorim Jaggi
8c98190898
am 311f8a7c: am 11accf51: Merge "Make sure starting windows only draw once" into mnc-dev
...
* commit '311f8a7cb0196d3a49a0f600856671193974b5ed':
Make sure starting windows only draw once
2015-06-02 22:49:00 +00:00
Nicolas Prevot
8a4dbac598
am 83366d50: am db6ac0e9: Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev
...
* commit '83366d500f48f73b8465c7e6cbe83c7a5aa91bbe':
Make ACTION_PROVISION_MANAGED_DEVICE public.
2015-06-02 22:28:46 +00:00
Svetoslav
c87f485da5
am 7c773529: am 3aa3f5f8: Merge "Fix java doc" into mnc-dev
...
* commit '7c773529afeff7d88386045c75b1eab994ae4ea9':
Fix java doc
2015-06-02 22:28:42 +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
Svetoslav
12e7abc659
am 703c7f9e: am c5ff0020: Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev
...
* commit '703c7f9e776bb900f19c4dc30c03c6a22c833aba':
Add API to hint whether to show on-board UI before a permission request.
2015-06-02 22:15:46 +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
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
6b37b0df11
am 03c818b5: am b36ad5dc: Decouple ProviderStatus & internal provider state
...
* commit '03c818b575c9f4481fee3ceaf21ac07540a69619':
Decouple ProviderStatus & internal provider state
2015-06-02 21:16:41 +00:00
Amith Yamasani
9984f181c5
am 52f26b63: am ff3b76d0: Merge "Temporarily whitelist an app for network during doze" into mnc-dev
...
* commit '52f26b6399cd28bfaa5822cb4c3a5340404f7800':
Temporarily whitelist an app for network during doze
2015-06-02 21:10:40 +00:00
Robin Lee
9aa9054169
am 805402de: am 02a400ca: Merge "Device policy: consistent javadoc and annotations" into mnc-dev
...
* commit '805402de76dc983b2b785d77531f81ab6eea5f87':
Device policy: consistent javadoc and annotations
2015-06-02 21:10:18 +00:00
Wale Ogunwale
be86841c64
am 28e00af9: am c9a04522: Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev
...
* commit '28e00af912154849c7e2bc592e16ee77155038e3':
@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.
2015-06-02 21:09:30 +00:00
Robin Lee
24613fae6b
am b3530734: am f4d9ecc5: Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev
...
* commit 'b35307343a72a24165e8adceec2fba8222ef86eb':
Revert "Consistent documentation and annotations for DPMS"
2015-06-02 21:09:09 +00:00
Robin Lee
b95551290a
am 9b286dd6: am 5de95550: Merge "Consistent documentation and annotations for DPMS" into mnc-dev
...
* commit '9b286dd637775d157b273cdb8dfec9e83af5c050':
Consistent documentation and annotations for DPMS
2015-06-02 21:09:03 +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
ff3b76d046
Merge "Temporarily whitelist an app for network during doze" into mnc-dev
2015-06-02 20:34:59 +00:00
Robin Lee
02a400ca6e
Merge "Device policy: consistent javadoc and annotations" into mnc-dev
2015-06-02 19:53:41 +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
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
e3f430e1dc
am 2ca50571: am 2ed6369c: Merge "System Health: Support expiring tokens" into mnc-dev
...
* commit '2ca505718d6a607e49dbab8704dc354c72e371ce':
System Health: Support expiring tokens
2015-06-02 17:49:10 +00:00
Wei Wang
4db77febac
am 96195285: am 6f54da32: Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev
...
* commit '9619528558e9d97eb518d29f7cf72b5fa3fe194c':
Expose a few system APIs for BLE scan only mode.
2015-06-02 17:48:59 +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
Svet Ganov
0f7f72dae6
am a332605f: am 8fa8b95c: Merge "Respect accessibility importance for before/after node ordering." into mnc-dev
...
* commit 'a332605fb71fc7f99721bf23a22a6d93b2c4ccec':
Respect accessibility importance for before/after node ordering.
2015-06-02 17:14:13 +00:00
Alan Viverette
e18cfd3954
am 0693b7c4: am 54310008: Merge "Remove strict mode violation from value to string coercion" into mnc-dev
...
* commit '0693b7c4f6aa1e3a4aaa3e79b49c59654aa10adf':
Remove strict mode violation from value to string coercion
2015-06-02 17:14:08 +00: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
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
39e04519ca
am 305c1941: am 1f8b8448: Bluetooth: Fix to avoid framework reboot during monkey testing
...
* commit '305c19412544f7dc5ce38d1f7949f9fc9acf47bd':
Bluetooth: Fix to avoid framework reboot during monkey testing
2015-06-02 14:24:58 +00:00
Andre Eisenbach
59a13c46ce
am ac00438d: am 708f57f4: Un-hide connectGatt() variant with selective transport
...
* commit 'ac00438d00e42f49b1d278bbd0d632e7caeef137':
Un-hide connectGatt() variant with selective transport
2015-06-02 14:24:10 +00:00
Ruben Brunk
8b2cf64630
am cf4a301f: am 11df5b66: Merge "Track camera and flashlight usage in battery stats." into mnc-dev
...
* commit 'cf4a301fa94f71e46cccbceeb8e8e9910eeb714a':
Track camera and flashlight usage in battery stats.
2015-06-02 14:24:01 +00:00
Clara Bayarri
9ebf752289
am 8ed46d3f: am a0b77dd5: Merge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev
...
* commit '8ed46d3f0a3a30414b178b41ea7160bac46ea3d7':
Fix TextView ActionMode overflow finishes the ActionMode
2015-06-02 14:23:44 +00:00
Clara Bayarri
dc1630e453
am 4ebfd76a: am d63a1776: Merge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev
...
* commit '4ebfd76a8975cd90edea06343d6a6aba586712b5':
Make Text Selection Action Mode secondary items IF_ROOM
2015-06-02 14:23:39 +00:00
Adam Powell
3fe0c56559
am 3e033267: am fa3f17f1: Merge "Don\'t take the compatibility path for non-primary ActionModes" into mnc-dev
...
* commit '3e03326719f7e4481c3204e834bc1c8fbdfd3466':
Don't take the compatibility path for non-primary ActionModes
2015-06-02 14:23:32 +00:00
Svetoslav
f53f3c2432
am fcec13f0: am 4982e7b4: Merge "Don\'t add real children for a view with a node provider" into mnc-dev
...
* commit 'fcec13f095186f95bd8483d7ea226944e8913cb4':
Don't add real children for a view with a node provider
2015-06-02 14:23:14 +00:00
Jorim Jaggi
b17e96de98
am a60e4b08: am 03a7c4c6: Fix shared drawable state
...
* commit 'a60e4b08a0e7d536c930f5455f568d75b558e396':
Fix shared drawable state
2015-06-02 14:23:03 +00:00