Commit Graph

48322 Commits

Author SHA1 Message Date
Erik Kline
5f69ef9e33 am b12c9704: Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev
* commit 'b12c97040bff6b42a513b50cdf75a98d41cdb249':
  Send neighbors into NUD_PROBE rather than NUD_DELAY
2015-06-03 02:07:43 +00:00
Erik Kline
b12c97040b Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev 2015-06-03 01:59:49 +00:00
Svetoslav
8d8caf3091 am f559546d: Merge "Add annotations to a new API" into mnc-dev
* commit 'f559546d8c47988f5c4278bde27eb26da1c256cc':
  Add annotations to a new API
2015-06-03 01:06:07 +00:00
Jun Mukai
a2c1367351 am 3c134877: Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev
* commit '3c1348773ad48edbd73cf32d9ae6d23841ea4cff':
  Retire PFLAG_ONLY_DRAWS_BACKGROUND.
2015-06-03 01:05:53 +00:00
Roozbeh Pournader
ecb667ac1e am c021632e: Merge "Load hyphenation data for more languages." into mnc-dev
* commit 'c021632e0750e495e62c3952c506a3e5ed516dc2':
  Load hyphenation data for more languages.
2015-06-03 01:05:48 +00:00
Svetoslav
f559546d8c Merge "Add annotations to a new API" into mnc-dev 2015-06-03 01:01:41 +00:00
Svetoslav
9ce9a15f62 Add annotations to a new API
Change-Id: I41a87a0ba81b1123e06096db510a02a1d9e6531d
2015-06-02 17:59:31 -07:00
Jun Mukai
3c1348773a Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev 2015-06-03 00:59:15 +00:00
Roozbeh Pournader
c021632e07 Merge "Load hyphenation data for more languages." into mnc-dev 2015-06-03 00:56:24 +00:00
Casper Bonde
1f276f5aaa am da177bb5: SAP: Change to use new SDP Api (4/4)
* commit 'da177bb5a0972fec1ecedcb7d9dbd969a1b09b25':
  SAP: Change to use new SDP Api (4/4)
2015-06-03 00:18:09 +00:00
Casper Bonde
da177bb5a0 SAP: Change to use new SDP Api (4/4)
Added class to carry SAP SDP record data.

Change-Id: Ic0d07402eca52c88e2be101181f6dd12e5e738d0
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
2015-06-03 00:04:37 +00:00
Alan Viverette
abd531e1df am e25f6587: Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev
* commit 'e25f6587d84c94331b2692e4eb6a2c1cbeb4be5b':
  API review feedback for ThemedSpinnerAdapter, Spinner
2015-06-03 00:00:45 +00:00
Alan Viverette
e25f6587d8 Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev 2015-06-02 23:51:07 +00:00
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
7d01d2c6cf Merge "Fix API review: Camera prewarm" into mnc-dev 2015-06-02 22:25:29 +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
Alan Viverette
2add9bcf8c API review feedback for ThemedSpinnerAdapter, Spinner
Moves themed interface out of Spinner and extends SpinnerAdapter, updates
Spinner constructor to take a Theme rather than a Context.

Does NOT change BaseAdapter to implement ThemedSpinnerAdapter, because
the BaseAdapter class does not have any notion of layout inflation and
that would break the contract implied by ThemedSpinnerAdapter.

Bug: 21571899
Change-Id: Id7e8d630458857ce6c93a6a8b8f920e169ee1152
2015-06-02 14:54:40 -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
Jun Mukai
3427f57e03 Retire PFLAG_ONLY_DRAWS_BACKGROUND.
Per discussion on another CL, this CL retires
PFLAG_ONLY_DRAWS_BACKGROUND because this is over-optimizing and
misleading.  Also setFlags() needs to care both the background
and the foreground.

Bug: 20734520
Change-Id: I57d63e776b5fbad9effd10ad87e683bbb2a6dacd
2015-06-02 14:27:35 -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
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