Bart Sears
63a75e3b89
Revert "Remove ActivityManager calls with PM.mInstallLock held"
...
This reverts commit ac06a4907b
2016-05-27 21:28:50 +00:00
Fyodor Kupolov
2d8583e0e4
Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev am: a4dbdaf5e9 am: 5d531e4f6c
...
am: f6816ad3c5
2016-05-27 17:50:31 +00:00
Jeff Sharkey
9b34b66b66
resolve merge conflicts of 58db550 to master
...
Change-Id: I39f7760c008af1d4a107b6b929b44c79d2f463be
2016-05-27 10:12:55 -06:00
Fyodor Kupolov
5d531e4f6c
Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev
...
am: a4dbdaf5e9
2016-05-27 03:05:20 +00:00
Jeff Sharkey
bda14dd987
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
...
am: 36cbf5ca37
2016-05-27 02:42:44 +00:00
Fyodor Kupolov
63cd09dfb4
Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev am: 2c5cbd4012
...
am: 0ebf3cc47c
2016-05-27 01:02:29 +00:00
Fyodor Kupolov
2c5cbd4012
Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev
2016-05-27 00:48:38 +00:00
Fyodor Kupolov
a4dbdaf5e9
Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev
2016-05-26 18:20:36 +00:00
TreeHugger Robot
36cbf5ca37
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
2016-05-26 16:49:51 +00:00
Jeff Sharkey
4815ed4500
Cache IMountService for isUserKeyUnlocked() calls.
...
This avoids doing a ServiceManager lookup for every call through
this hot code-path.
Bug: 28946245
Change-Id: I210ce34b33e5b40a5ab4e92ddce87fc5e9964be2
2016-05-26 09:31:06 -06:00
Adam Powell
8c6e691c09
Merge "N is API 24" into nyc-dev am: bc983c4431 am: 0b478d5b05
...
am: 3579a6a634
2016-05-26 02:21:03 +00:00
Adam Powell
3579a6a634
Merge "N is API 24" into nyc-dev am: bc983c4431
...
am: 0b478d5b05
2016-05-26 01:56:59 +00:00
Adam Powell
528a5bd466
Merge "N is API 24" into nyc-dev
...
am: bc983c4431
2016-05-26 01:21:19 +00:00
Adam Powell
43ec62af45
N is API 24
...
Change-Id: Ifea71ccff96c3c70f9f3e60ecdcb2b56af82bb08
2016-05-25 16:42:56 -07:00
Fyodor Kupolov
ac06a4907b
Remove ActivityManager calls with PM.mInstallLock held
...
UserController now pushes user state to UMS.
PM now checks user running/unlocking/unlocked state by calling
UserManagerInternal.
Bug: 28090199
Change-Id: I20e62b37f78238f28dd81f49f876732bbd3c6b34
2016-05-25 14:55:09 -07:00
TreeHugger Robot
e1b53d7cab
Merge "Add missing @Deprecated annotations."
2016-05-25 17:46:40 +00:00
Fyodor Kupolov
88257587ce
Clean up demo dir when leaving demo mode
...
Delete contents of demo dir when device is provisioned and demo_mode is
disabled
Bug: 28855287
Change-Id: I6e1826ec23a2ff92402fe079a9e7b565a2fe04d7
2016-05-24 18:24:52 -07:00
Chet Haase
2675da9dbf
Merge "Remove hidden LocaleList default constructor" into nyc-dev am: ba2cc82399 am: f33737d646
...
am: e8de8b7a3b
2016-05-25 01:11:49 +00:00
Chet Haase
f33737d646
Merge "Remove hidden LocaleList default constructor" into nyc-dev
...
am: ba2cc82399
2016-05-25 01:02:41 +00:00
Chet Haase
f3d5ec05b4
Remove hidden LocaleList default constructor
...
Previous change hid this constructor. Now removing it entirely for completeness.
Issue #28296200 API Review: LocaleList
Change-Id: I43476994070b101999d338ec1f5d1a1a0a2a7658
2016-05-24 16:07:00 -07:00
Aurimas Liutikas
514c5ef8d5
Add missing @Deprecated annotations.
...
Add missing @Deprecated annotations for methods with @deprecated tag
in javadoc.
Change-Id: I35b78ccb97832d86b914c21a300444ba29e33844
2016-05-24 15:22:55 -07:00
Tianjie Xu
9ae172f9b9
Merge "Report OTA time statistics" into nyc-dev am: 86f97177e9 am: 7135fab76c
...
am: 375a512c0d
2016-05-24 21:59:28 +00:00
Tianjie Xu
375a512c0d
Merge "Report OTA time statistics" into nyc-dev am: 86f97177e9
...
am: 7135fab76c
2016-05-24 21:47:52 +00:00
Adam Lesinski
534881d8fa
Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb am: 5e106dea45
...
am: 9ed84d8612
2016-05-24 21:47:36 +00:00
Adam Lesinski
9ed84d8612
Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb
...
am: 5e106dea45
2016-05-24 21:41:20 +00:00
Tianjie Xu
acf91cd6c5
Merge "Report OTA time statistics" into nyc-dev
...
am: 86f97177e9
2016-05-24 21:41:06 +00:00
Tianjie Xu
86f97177e9
Merge "Report OTA time statistics" into nyc-dev
2016-05-24 21:35:25 +00:00
Adam Lesinski
5e5e871fdc
Merge "Improve performance of LocaleList with Resources" into nyc-dev
...
am: bb26248bbb
2016-05-24 21:34:48 +00:00
Tianjie Xu
dcd3644f22
Report OTA time statistics
...
Read time and I/O for OTA update from last_install, and report the
statistics using MetricsLogger.histogram.
Bug: 28658632
Change-Id: I7fd06a82cbabd346d6d44f81ebad08f6baf4b8d0
2016-05-24 13:00:30 -07:00
Adam Lesinski
b61e405397
Improve performance of LocaleList with Resources
...
We allow each individual Resources object to select the best
Locale for the given APK. This allows one update to the configuration
instead of multiple updates, once the locale is chosen.
The Java locale is selected from the app context's locale.
Bug:28625993
Bug:27325465
Change-Id: I99e1e53f522e560f3b80bbd1e1c605f552dbdff0
2016-05-24 12:54:48 -07:00
Ian Rogers
63f289a8a1
Merge "Fix bug where FileUtils.deleteOlderFiles wouldn't delete the oldest files."
2016-05-19 16:59:10 +00:00
Robin Lee
24f7b92a3c
Merge "Lock down networking when waiting for always-on" into nyc-dev am: d171df660e am: 77ab7fc8d4
...
am: 22e9213a1c
2016-05-18 23:53:25 +00:00
Robin Lee
22e9213a1c
Merge "Lock down networking when waiting for always-on" into nyc-dev am: d171df660e
...
am: 77ab7fc8d4
2016-05-18 23:47:52 +00:00
Robin Lee
43fbfbf94c
Merge "Lock down networking when waiting for always-on" into nyc-dev
...
am: d171df660e
2016-05-18 23:42:40 +00:00
Robin Lee
d171df660e
Merge "Lock down networking when waiting for always-on" into nyc-dev
2016-05-18 23:37:24 +00:00
Robin Lee
17e6183b85
Lock down networking when waiting for always-on
...
Fix: 26694104
Fix: 27042309
Fix: 28335277
Change-Id: I47a4c9d2b98235195b1356af3dabf7235870e4fa
2016-05-19 00:26:53 +01:00
Paul Crowley
2970216a2b
Merge "Two phases to set the password for disk encryption" into nyc-dev am: 56a9395aeb am: 2a1076339e
...
am: 02826bb36b
2016-05-18 22:59:54 +00:00
Paul Crowley
2a1076339e
Merge "Two phases to set the password for disk encryption" into nyc-dev
...
am: 56a9395aeb
2016-05-18 22:50:02 +00:00
Paul Crowley
56a9395aeb
Merge "Two phases to set the password for disk encryption" into nyc-dev
2016-05-18 22:40:09 +00:00
TreeHugger Robot
68c92c7ca6
Merge "Added a getPrimaryStorageSize() method."
2016-05-18 22:35:26 +00:00
Amith Yamasani
a3d46611e3
Merge "Retail mode flag and some clients for it" into nyc-mr1-dev am: dbf0dbd8c2
...
am: 1ab19ea6e6
2016-05-18 21:07:37 +00:00
Amith Yamasani
dbf0dbd8c2
Merge "Retail mode flag and some clients for it" into nyc-mr1-dev
2016-05-18 20:57:12 +00:00
Robert Sesek
9576535c80
Merge "Split the zygote logic out of android.os.Process into a new ZygoteProcess class."
2016-05-18 20:08:44 +00:00
Yohei Yukawa
af15c8bcae
Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681
...
am: bf4c8f730b
2016-05-18 02:25:10 +00:00
Yohei Yukawa
31884efd13
Merge "Move LocaleList to avoid layering violation." into nyc-dev
2016-05-18 02:14:26 +00:00
Joe Onorato
160d5c57cf
Merge changes If51568c3,Idd434c19 into nyc-dev am: 45165c9373 am: 6b10cec210
...
am: 269f64079b
2016-05-18 00:55:42 +00:00
Amith Yamasani
eb437d4dff
Retail mode flag and some clients for it
...
Bug: 27280140
Change-Id: Ide33e941b9c71eb925b5977d0b0d62198537ca14
2016-05-18 00:07:36 +00:00
Yohei Yukawa
23cbe85610
Move LocaleList to avoid layering violation.
...
Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.
Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
2016-05-17 16:42:58 -07:00
Joe Onorato
22cfef381d
@hide SystemHealthManager.from
...
Bug: 28820055
Change-Id: Idd434c196428178e2c66facea36a7e010246611c
2016-05-17 15:29:51 -07:00
Paul Crowley
cc70155f3b
Two phases to set the password for disk encryption
...
Revert "Revert "Two phases to set the password for disk encryption""
This reverts commit a1eb750e75
2016-05-17 15:22:29 -07:00
