Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
235,480 Commits 3 Branches 0 Tags
4e516daab2b21c4059855238dc1f611eb633a7e8
Commit Graph

56073 Commits

Author SHA1 Message Date
Clara Bayarri
4e516daab2 Merge "Make FingerprintManager#hasEnrolledFingerprints per-user" into nyc-dev am: aa83d163aa 
am: 8a217eba48

* commit '8a217eba48f08a8a55d74c7b23fde5ef70fb2a1e':
  Make FingerprintManager#hasEnrolledFingerprints per-user
 2016-02-24 01:42:59 +00:00
Clara Bayarri
8a217eba48 Merge "Make FingerprintManager#hasEnrolledFingerprints per-user" into nyc-dev 
am: aa83d163aa

* commit 'aa83d163aa93b8a4f267e8fc434a3916f540d561':
  Make FingerprintManager#hasEnrolledFingerprints per-user
 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
f2b52ec51f Merge "Disable switching users until user 0 is unlocked" into nyc-dev am: 598255ae02 
am: 0bf96d30e7

* commit '0bf96d30e7f514530bae83d7f70a65e4a4d6369b':
  Disable switching users until user 0 is unlocked
 2016-02-24 01:08:23 +00:00
Fyodor Kupolov
0bf96d30e7 Merge "Disable switching users until user 0 is unlocked" into nyc-dev 
am: 598255ae02

* commit '598255ae02752f06acf86db30f4e0f5655d2ea96':
  Disable switching users until user 0 is unlocked
 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
b5520d1eee Merge "Support running AVD on UI thread" into nyc-dev am: 3005843506 
am: 3c4f36daac

* commit '3c4f36daacdd385e9ed40617855cad3f84168d07':
  Support running AVD on UI thread
 2016-02-23 23:13:08 +00:00
Doris Liu
3c4f36daac Merge "Support running AVD on UI thread" into nyc-dev 
am: 3005843506

* commit '30058435065f392754e749fe43589dd8b452727d':
  Support running AVD on UI thread
 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
8e5ca50db7 Merge changes I4e45afed,I2ea19f9a,I922d6f38 into nyc-dev am: 62b9ff4994 
am: 1ba39aa54e

* commit '1ba39aa54e49882df0116b7538f73a6a688cb830':
  Add unit tests for BatteryStatsImpl.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
 2016-02-23 21:37:21 +00:00
Joe Onorato
1ba39aa54e Merge changes I4e45afed,I2ea19f9a,I922d6f38 into nyc-dev 
am: 62b9ff4994

* commit '62b9ff49947ccfca7d9f2ffe0e34006821080819':
  Add unit tests for BatteryStatsImpl.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
 2016-02-23 21:24:01 +00:00
Jeff Sharkey
f90abdebdb Merge "Offer to cache ringtones in system DE storage." into nyc-dev am: 1ce5c28ba5 
am: 2b2974dcef

* commit '2b2974dcef503da3b02c7bd67becad709ead7951':
  Offer to cache ringtones in system DE storage.
 2016-02-23 21:23:54 +00:00
Michael Wright
bf6da7ad01 Merge "Fix conditional when checking for confirm key." 2016-02-23 21:16:25 +00:00
Jeff Sharkey
2b2974dcef Merge "Offer to cache ringtones in system DE storage." into nyc-dev 
am: 1ce5c28ba5

* commit '1ce5c28ba54f31c0013542df81975148657b8229':
  Offer to cache ringtones in system DE storage.
 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
7844b8a84c Merge "Remove @Nullable annotation from getDrawable() methods" into nyc-dev am: 0df7c98adf 
am: cadb829532

* commit 'cadb829532016352d0b9dd99ffdda97818422941':
  Remove @Nullable annotation from getDrawable() methods
 2016-02-23 20:40:14 +00:00
Alan Viverette
cadb829532 Merge "Remove @Nullable annotation from getDrawable() methods" into nyc-dev 
am: 0df7c98adf

* commit '0df7c98adf75e2f8a176e742e1bb325aee2808e6':
  Remove @Nullable annotation from getDrawable() methods
 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
John Reck
fcb39f64ba Merge "destroyHardwareResources in onStop()" into nyc-dev am: e5bfd2da4d 
am: 5962a84e5f

* commit '5962a84e5ff6044adaf8b1dcee6902174c6a9027':
  destroyHardwareResources in onStop()
 2016-02-23 20:00:22 +00: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

* commit 'e5bfd2da4d60c90a137a1eb883802c13ae53273e':
  destroyHardwareResources in onStop()
 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
c8ebe62cb8 Merge "Using addAssetPathAsSharedLibrary in WebViewDelegate" into nyc-dev am: eabebc1539 
am: 8ecca7d7f7

* commit '8ecca7d7f79eac025192c86a0ef5516e6740e897':
  Using addAssetPathAsSharedLibrary in WebViewDelegate
 2016-02-23 19:09:30 +00:00
Tao Bai
8ecca7d7f7 Merge "Using addAssetPathAsSharedLibrary in WebViewDelegate" into nyc-dev 
am: eabebc1539

* commit 'eabebc1539b7e8b412da33c9e462665087cb1bfc':
  Using addAssetPathAsSharedLibrary in WebViewDelegate
 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ß
5aaf46adc7 Merge "Remove deprecated APIs DPM.createUser, createAndInitializeUser" into nyc-dev am: f398479e06 
am: b737c71611

* commit 'b737c71611e21fdf591b1c0cbb8e32cc28cb8bea':
  Remove deprecated APIs DPM.createUser, createAndInitializeUser
 2016-02-23 18:06:24 +00:00
Philipp Weiß
b737c71611 Merge "Remove deprecated APIs DPM.createUser, createAndInitializeUser" into nyc-dev 
am: f398479e06

* commit 'f398479e069c7accb1f96b06b32e086609342669':
  Remove deprecated APIs DPM.createUser, createAndInitializeUser
 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
d6ee93118d Merge "Only copy layout param title if it is different from the current one." into nyc-dev am: 70c0817b76 
am: 7c8b1a873a

* commit '7c8b1a873a39d18b780f1c2b6236f9193e64fb92':
  Only copy layout param title if it is different from the current one.
 2016-02-23 16:17:48 +00:00
Wale Ogunwale
7c8b1a873a Merge "Only copy layout param title if it is different from the current one." into nyc-dev 
am: 70c0817b76

* commit '70c0817b76c255ac3c17e513a5545d7ef9e4126c':
  Only copy layout param title if it is different from the current one.
 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
3f81b96990 Merge "PackageManager: add Vulkan system features" into nyc-dev am: 791a7df8b2 
am: 03d2fb32c1

* commit '03d2fb32c157b9faa2ff47c90ecab749ee2574eb':
  PackageManager: add Vulkan system features
 2016-02-23 15:18:59 +00:00
Jesse Hall
03d2fb32c1 Merge "PackageManager: add Vulkan system features" into nyc-dev 
am: 791a7df8b2

* commit '791a7df8b2d4cef843b109aa98a0a9e2ff429462':
  PackageManager: add Vulkan system features
 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
683e6defc3 Merge "Make user provisioning state SystemApi" into nyc-dev am: 72283fdb61 
am: 6bd76ca08a

* commit '6bd76ca08a55bccdc8db1cd51592ebf40d3cfd76':
  Make user provisioning state SystemApi
 2016-02-23 13:58:54 +00:00
Benjamin Franz
6bd76ca08a Merge "Make user provisioning state SystemApi" into nyc-dev 
am: 72283fdb61

* commit '72283fdb61df5c057d105644f0ae35ae9ae248b5':
  Make user provisioning state SystemApi
 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
c9de4886ab Merge "add @SystemApi to WEBVIEW_MULTIPROCESS to enable it to be used in WebView glue" into nyc-dev am: cf7518f78a 
am: 13d95c2afd

* commit '13d95c2afd92a30886a1427b333deab60dc167ca':
  add @SystemApi to WEBVIEW_MULTIPROCESS to enable it to be used in WebView glue
 2016-02-23 10:40:22 +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

* commit 'cf7518f78af84aaafc7cd38ff69eec357a5b3055':
  add @SystemApi to WEBVIEW_MULTIPROCESS to enable it to be used in WebView glue
 2016-02-23 10:37:24 +00:00