Svetoslav
f81b973687
am 12e7abc6: am 703c7f9e: am c5ff0020: Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev
...
* commit '12e7abc65971832285c873aa78d9b08d862f7d70':
Add API to hint whether to show on-board UI before a permission request.
2015-06-02 22:28:59 +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
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
df336c9064
am 6b37b0df: am 03c818b5: am b36ad5dc: Decouple ProviderStatus & internal provider state
...
* commit '6b37b0df1102f0f7f3336638a68defba197d1910':
Decouple ProviderStatus & internal provider state
2015-06-02 21:27:59 +00:00
Amith Yamasani
982c0d9d4d
am 9984f181: am 52f26b63: am ff3b76d0: Merge "Temporarily whitelist an app for network during doze" into mnc-dev
...
* commit '9984f181c5d0ed933837e548a97729ae81b5e4dd':
Temporarily whitelist an app for network during doze
2015-06-02 21:27:36 +00:00
Robin Lee
afbf476283
am 9aa90541: am 805402de: am 02a400ca: Merge "Device policy: consistent javadoc and annotations" into mnc-dev
...
* commit '9aa905416931860cd92364aa2453c6a859785b2e':
Device policy: consistent javadoc and annotations
2015-06-02 21:27:19 +00:00
Wale Ogunwale
f306ae7260
am be86841c: am 28e00af9: am c9a04522: Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev
...
* commit 'be86841c64ea0d1b67bd77c0a5687729bc521b27':
@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.
2015-06-02 21:26:41 +00:00
Robin Lee
61ffa153ec
am 24613fae: am b3530734: am f4d9ecc5: Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev
...
* commit '24613fae6b82456837ab8e5d495fdf88a336ce52':
Revert "Consistent documentation and annotations for DPMS"
2015-06-02 21:26:30 +00:00
Robin Lee
45b5675d4c
am b9555129: am 9b286dd6: am 5de95550: Merge "Consistent documentation and annotations for DPMS" into mnc-dev
...
* commit 'b95551290a61c1a1b2cbc494055cdcd0f681e060':
Consistent documentation and annotations for DPMS
2015-06-02 21:26:24 +00: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
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
Carlos Valdivia
de326e63fa
am e3f430e1: am 2ca50571: am 2ed6369c: Merge "System Health: Support expiring tokens" into mnc-dev
...
* commit 'e3f430e1dc56037699ae63585cbe3b5787aa9519':
System Health: Support expiring tokens
2015-06-02 20:32:58 +00:00
Wei Wang
7e1fa88e0e
am 4db77feb: am 96195285: am 6f54da32: Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev
...
* commit '4db77febac5ffba9c5581d149524c3e8d760b711':
Expose a few system APIs for BLE scan only mode.
2015-06-02 20:32:49 +00:00
Svet Ganov
ad602c3c82
am 0f7f72da: am a332605f: am 8fa8b95c: Merge "Respect accessibility importance for before/after node ordering." into mnc-dev
...
* commit '0f7f72dae6fc6cdae5a668baff16d605fd140c7b':
Respect accessibility importance for before/after node ordering.
2015-06-02 20:32:35 +00:00
Alan Viverette
88dba6c893
am e18cfd39: am 0693b7c4: am 54310008: Merge "Remove strict mode violation from value to string coercion" into mnc-dev
...
* commit 'e18cfd3954ccc75b9c881528c5468d99c9f242f1':
Remove strict mode violation from value to string coercion
2015-06-02 20:32:30 +00:00
Robin Lee
02a400ca6e
Merge "Device policy: consistent javadoc and annotations" into mnc-dev
2015-06-02 19:53:41 +00:00
Nitin Shivpure
19e72a689d
am 39e04519: am 305c1941: am 1f8b8448: Bluetooth: Fix to avoid framework reboot during monkey testing
...
* commit '39e04519ca1ecfa2c005394e50e2549979627b7c':
Bluetooth: Fix to avoid framework reboot during monkey testing
2015-06-02 19:23:47 +00:00
Andre Eisenbach
cd5f41e863
am 59a13c46: am ac00438d: am 708f57f4: Un-hide connectGatt() variant with selective transport
...
* commit '59a13c46ceef126a19476078e28205f456c9003f':
Un-hide connectGatt() variant with selective transport
2015-06-02 19:23:05 +00:00
Ruben Brunk
b179685bfe
am 8b2cf646: am cf4a301f: am 11df5b66: Merge "Track camera and flashlight usage in battery stats." into mnc-dev
...
* commit '8b2cf64630074d89dbf336741cecf3a54d3ddd2d':
Track camera and flashlight usage in battery stats.
2015-06-02 19:22:59 +00:00
Clara Bayarri
be850e8362
am 9ebf7522: am 8ed46d3f: am a0b77dd5: Merge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev
...
* commit '9ebf7522895589d7bc9d6508c100ef8a26d42c9f':
Fix TextView ActionMode overflow finishes the ActionMode
2015-06-02 19:22:40 +00:00
Clara Bayarri
6ed5549cf1
am dc1630e4: am 4ebfd76a: am d63a1776: Merge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev
...
* commit 'dc1630e45334b72a337e4dcb31fce453aa0fd3e1':
Make Text Selection Action Mode secondary items IF_ROOM
2015-06-02 19:22:34 +00:00
Adam Powell
536b6a8147
am 3fe0c565: am 3e033267: am fa3f17f1: Merge "Don\'t take the compatibility path for non-primary ActionModes" into mnc-dev
...
* commit '3fe0c56559e305e0dabb899f171f5ef4996ddcae':
Don't take the compatibility path for non-primary ActionModes
2015-06-02 19:22:28 +00:00
Svetoslav
64f0090286
am f53f3c24: am fcec13f0: am 4982e7b4: Merge "Don\'t add real children for a view with a node provider" into mnc-dev
...
* commit 'f53f3c24324967e1eb055b0944a2f11acfcfe625':
Don't add real children for a view with a node provider
2015-06-02 19:22:23 +00:00
Jorim Jaggi
54e12e8cc0
am b17e96de: am a60e4b08: am 03a7c4c6: Fix shared drawable state
...
* commit 'b17e96de98f16d9322ccca7457ee9c8197b416c9':
Fix shared drawable state
2015-06-02 19:22:15 +00:00
Selim Gurun
41a853fab7
am 5c40b533: am e94bc219: am 8a6d511d: Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev
...
* commit '5c40b53370f111fb82d9d82f6bfac8e2a16ffd6e':
Remove ViewAssistStructure and use the frameworks data structure
2015-06-02 19:22:02 +00:00
Alan Viverette
d584b26ae6
am 1a92fc59: am bbc27621: am b0f94ae5: Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev
...
* commit '1a92fc592b76519cf746b7d4f9ed2878163ebbbb':
Always send VIEW_CLICKED event from AdapterView.performItemClick()
2015-06-02 19:21:57 +00:00
Eino-Ville Talvala
9785e0eb61
am 742b4eb8: am 56650141: am 717a2d09: Merge "Camera2: Remove isLoggable" into mnc-dev
...
* commit '742b4eb890926c0d05ad04dc860bff95ce8e0bf3':
Camera2: Remove isLoggable
2015-06-02 19:21:47 +00:00
Jeff Brown
10b57f5fcb
am fab99fd8: am 17fa101c: am 0505f7f2: Merge "Terminate loop properly when cursor window is full." into mnc-dev
...
* commit 'fab99fd899cfd6fdd2ca44bbbb2a47b3aee4c0ad':
Terminate loop properly when cursor window is full.
2015-06-02 19:21:41 +00:00
Dianne Hackborn
6679bc0445
am 4f57deb9: am 0d69c19d: am 9ed0c410: Merge "Update VoiceInteractionService from API review." into mnc-dev
...
* commit '4f57deb99025c6d625ffb17eba92190670a26f67':
Update VoiceInteractionService from API review.
2015-06-02 19:20:33 +00:00
Raph Levien
c544053531
am 7689a967: am dcab9a13: am fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev
...
* commit '7689a967a76a8ddd827be9efd8b2b1b6c60f8648':
Revert "Revert "Use getRunAdvance to position cursor""
2015-06-02 19:20:21 +00:00
Alan Viverette
8760d9df16
am 9a5b45c1: am 49ceab84: am e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev
...
* commit '9a5b45c1e1e91f00fed6d84876a670f5278f934f':
Clean up AbsListView constructor
2015-06-02 19:20:15 +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
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