Lorenzo Colitti
86b5635540
resolve merge conflicts of 51e4acb29d to nyc-dev
...
am: 1142b2654a
2016-02-24 06:37:35 +00:00
Lorenzo Colitti
1142b2654a
resolve merge conflicts of 51e4acb29d to nyc-dev
...
Also add the appropriate changes to api/test-current.txt, which
is not present on mm-wireless-dev from which this change came.
Change-Id: Ic4df6d0f89add73b7e5252ef662de07a4e8fce31
2016-02-24 15:19:15 +09:00
Pierre Imai
51e4acb29d
Merge "Add Connectivity Metrics Logger service" into mm-wireless-dev
2016-02-24 04:49:24 +00:00
Jeff Sharkey
6008bb5488
Merge "Update accessibility to be encryption-aware." into nyc-dev
...
am: 1082306709
2016-02-24 03:22:40 +00:00
Jeff Sharkey
1082306709
Merge "Update accessibility to be encryption-aware." into nyc-dev
2016-02-24 03:17:11 +00:00
Jeff Sharkey
e88e266547
Update accessibility to be encryption-aware.
...
Look for both EA and non-EA accessibility services, but when the user
is locked only bind to EA services. Once the user is unlocked, we
take another pass and bind to any non-EA services.
We only consider disabling accessibility once the user is unlocked,
since there could be non-EA services waiting in the wings.
Bug: 25860579
Change-Id: I97bd019661457c3577d629ba12290d02f026011a
2016-02-23 20:15:15 -07:00
Clara Bayarri
8a217eba48
Merge "Make FingerprintManager#hasEnrolledFingerprints per-user" into nyc-dev
...
am: aa83d163aa
2016-02-24 01:36:27 +00:00
Clara Bayarri
aa83d163aa
Merge "Make FingerprintManager#hasEnrolledFingerprints per-user" into nyc-dev
2016-02-24 01:31:02 +00:00
Fyodor Kupolov
0bf96d30e7
Merge "Disable switching users until user 0 is unlocked" into nyc-dev
...
am: 598255ae02
2016-02-24 01:01:10 +00:00
Fyodor Kupolov
598255ae02
Merge "Disable switching users until user 0 is unlocked" into nyc-dev
2016-02-24 00:51:11 +00:00
Clara Bayarri
33fd3cf2d9
Make FingerprintManager#hasEnrolledFingerprints per-user
...
Needed by Settings to determine if the work profile has fingerprints
Bug: 27263452
Change-Id: Ic54f59461b44a525284f6a1ab3d17627c652f842
2016-02-23 16:49:58 -08:00
Doris Liu
3c4f36daac
Merge "Support running AVD on UI thread" into nyc-dev
...
am: 3005843506
2016-02-23 23:01:46 +00:00
Doris Liu
3005843506
Merge "Support running AVD on UI thread" into nyc-dev
2016-02-23 22:43:53 +00:00
Doris Liu
28cfd20f02
Support running AVD on UI thread
...
By default, AVD animates on RT thread. But since in some cases there's a
need for a finer control on when the frame update for the animation should
happen, such as coordiating the AVD animation with other animations that
run on UI thread, we are providing a way to force the AVD to run on UI
thread.
Bug: 27278616
Change-Id: I372ecd3dc52e3fa0bdce3a1e9c19443f9b199027
2016-02-23 14:40:47 -08:00
Joe Onorato
1ba39aa54e
Merge changes I4e45afed,I2ea19f9a,I922d6f38 into nyc-dev
...
am: 62b9ff4994
2016-02-23 21:24:01 +00:00
Jeff Sharkey
2b2974dcef
Merge "Offer to cache ringtones in system DE storage." into nyc-dev
...
am: 1ce5c28ba5
2016-02-23 21:12:27 +00:00
Joe Onorato
62b9ff4994
Merge changes I4e45afed,I2ea19f9a,I922d6f38 into nyc-dev
...
* changes:
Add unit tests for BatteryStatsImpl.
Turn down the logging a little bit.
Turn down the logging a little bit.
2016-02-23 21:06:23 +00:00
Jeff Sharkey
1ce5c28ba5
Merge "Offer to cache ringtones in system DE storage." into nyc-dev
2016-02-23 20:57:46 +00:00
Joe Onorato
abded113bd
Add unit tests for BatteryStatsImpl.
...
- Add a Clocks interface to wrap SystemClock.uptimeMillis and
SystemClock.elapsedRealtime.
- Make the inner classes static so they can be created independently,
which meant passing explicit pointers to the BatteryStatsImpl and
the Uid objects in a lot of places.
- Make several fields protected so they can be accessed by the tests (they are
still @hidden)
- Add a test suite for the battery stats.
- Add the tests
Change-Id: I4e45afedc64f7050985c28a7eb4f5c1ddbaa63fa
2016-02-23 12:44:22 -08:00
Alan Viverette
cadb829532
Merge "Remove @Nullable annotation from getDrawable() methods" into nyc-dev
...
am: 0df7c98adf
2016-02-23 20:34:58 +00:00
Alan Viverette
0df7c98adf
Merge "Remove @Nullable annotation from getDrawable() methods" into nyc-dev
2016-02-23 20:30:08 +00:00
Jeff Sharkey
413573ac59
Offer to cache ringtones in system DE storage.
...
Ringtones often live on shared media, which is now encrypted with CE
keys and not available until after the user is unlocked. To improve
the user experience while locked, cache the default ringtone,
notification sound, and alarm sound in a DE storage area.
Bug: 26730753
Change-Id: Ie6ad7790af4c87dd25759df3ed017e3b91a2fb87
2016-02-23 13:27:00 -07:00
Alan Viverette
fde0213716
Remove @Nullable annotation from getDrawable() methods
...
Developers usually do not need to check the result of getDrawable(), so
we shouldn't be annotating it like they do.
Bug: 27134828
Change-Id: I0db0ca806fd89c18781da452fe3f31ef344f3cca
2016-02-23 14:59:51 -05:00
Fyodor Kupolov
07140f7ffd
Disable switching users until user 0 is unlocked
...
Switching with user0 locked can be re-enabled by setting
allow_user_switching_when_system_user_locked flag to a non-zero value
Bug: 26933989
Change-Id: I0958058f1cc8a059db9c20930e07183c14c8460a
2016-02-23 11:58:54 -08:00
John Reck
5962a84e5f
Merge "destroyHardwareResources in onStop()" into nyc-dev
...
am: e5bfd2da4d
2016-02-23 19:52:41 +00:00
Chien-Yu Chen
d1733607cd
Merge "Camera2: Fix getInternalFormatSizes for depth" into nyc-dev
2016-02-23 19:52:20 +00:00
John Reck
e5bfd2da4d
Merge "destroyHardwareResources in onStop()" into nyc-dev
2016-02-23 19:45:09 +00:00
Tao Bai
8ecca7d7f7
Merge "Using addAssetPathAsSharedLibrary in WebViewDelegate" into nyc-dev
...
am: eabebc1539
2016-02-23 18:57:32 +00:00
Tao Bai
eabebc1539
Merge "Using addAssetPathAsSharedLibrary in WebViewDelegate" into nyc-dev
2016-02-23 18:52:15 +00:00
John Reck
d9b1607bd9
destroyHardwareResources in onStop()
...
Bug: 27286867
This hopefully makes everything fully-deterministic. It should
also fix some old annoyances around Bitmap lifecycle as they will
be released earlier in onStop() instead of waiting for
dispatchDetachedFromWindow() which may never happen.
Change-Id: I6e871760650780e327c0e42f62950c1052dd8019
2016-02-23 10:35:19 -08:00
Philipp Weiß
b737c71611
Merge "Remove deprecated APIs DPM.createUser, createAndInitializeUser" into nyc-dev
...
am: f398479e06
2016-02-23 18:01:41 +00:00
Philipp Weiß
f398479e06
Merge "Remove deprecated APIs DPM.createUser, createAndInitializeUser" into nyc-dev
2016-02-23 17:53:58 +00:00
Tao Bai
eb1368ba02
Using addAssetPathAsSharedLibrary in WebViewDelegate
...
BUG: 27245306
Change-Id: I346bc526cd9d311c290f61d0de04e33d708b81c4
2016-02-23 09:01:28 -08:00
Wale Ogunwale
7c8b1a873a
Merge "Only copy layout param title if it is different from the current one." into nyc-dev
...
am: 70c0817b76
2016-02-23 16:08:12 +00:00
Wale Ogunwale
70c0817b76
Merge "Only copy layout param title if it is different from the current one." into nyc-dev
2016-02-23 16:01:23 +00:00
Wale Ogunwale
1f240c9fbf
Only copy layout param title if it is different from the current one.
...
Fixes WindowManager_LayoutParamsTest failure introduced in ag/866860
Bug: 27297744
Change-Id: I27ebf5d35b074d6b9c1634bc7cd18bba2844352e
2016-02-23 07:54:03 -08:00
Jesse Hall
03d2fb32c1
Merge "PackageManager: add Vulkan system features" into nyc-dev
...
am: 791a7df8b2
2016-02-23 15:15:43 +00:00
Jesse Hall
791a7df8b2
Merge "PackageManager: add Vulkan system features" into nyc-dev
2016-02-23 15:11:52 +00:00
Benjamin Franz
6bd76ca08a
Merge "Make user provisioning state SystemApi" into nyc-dev
...
am: 72283fdb61
2016-02-23 13:55:20 +00:00
Benjamin Franz
72283fdb61
Merge "Make user provisioning state SystemApi" into nyc-dev
2016-02-23 13:51:08 +00:00
Benjamin Franz
eed2a8e165
Make user provisioning state SystemApi
...
These APIs are used by the SUW. To go with the convention that all SUW
APIs should be SystemApi, adding it to these ones.
Bug: 25858670
Change-Id: Icffc9cdc13fa87da3543d92308f87dd0c9764c81
2016-02-23 13:02:57 +00:00
Toby Sargeant
13d95c2afd
Merge "add @SystemApi to WEBVIEW_MULTIPROCESS to enable it to be used in WebView glue" into nyc-dev
...
am: cf7518f78a
2016-02-23 10:37:24 +00:00
Toby Sargeant
cf7518f78a
Merge "add @SystemApi to WEBVIEW_MULTIPROCESS to enable it to be used in WebView glue" into nyc-dev
2016-02-23 10:35:09 +00:00
Tony Mak
8d95e5fd05
Merge "Update javadoc of DISALLOW_OUTGOING_CALLS" into nyc-dev
...
am: 38e638696a
2016-02-23 10:29:04 +00:00
Tony Mak
38e638696a
Merge "Update javadoc of DISALLOW_OUTGOING_CALLS" into nyc-dev
2016-02-23 10:24:50 +00:00
Pavel Zhamaitsiak
02b3e6bfc5
Add Connectivity Metrics Logger service
...
This service can be used to pass events to metrics collection service
Change-Id: I213874300693cd121f2c8676f70893315de4c4c0
2016-02-23 17:32:53 +09:00
Dianne Hackborn
39d8714086
Merge "Fix issue #26695393 : Remove NEW_PICTURE and NEW_VIDEO broadcast" into nyc-dev
...
am: 76c970de3c#26695393 : Remove NEW_PICTURE and NEW_VIDEO broadcast
2016-02-23 03:34:30 +00:00
Dianne Hackborn
76c970de3c
Merge "Fix issue #26695393 : Remove NEW_PICTURE and NEW_VIDEO broadcast" into nyc-dev
2016-02-23 03:26:48 +00:00
Svetoslav Ganov
de04cc55ff
Merge "Expose removed permissions flag as system API" into nyc-dev
...
am: 5cd52bee32
2016-02-23 02:29:24 +00:00
Svetoslav Ganov
5cd52bee32
Merge "Expose removed permissions flag as system API" into nyc-dev
2016-02-23 02:21:01 +00:00
