Esteban Talavera
cc12064670
Merge "Fix getApplicationRestrictions documentation" into nyc-dev
...
am: a86d6c4df3
2016-06-07 17:59:01 +00:00
Esteban Talavera
953fe48329
Fix getApplicationRestrictions documentation
...
The method never returns null, only empty bundle
Bug: 29178626
Change-Id: Ic53154eafe94c6c501b59932441d7ae1c89cb689
2016-06-07 17:21:49 +01:00
Benjamin Franz
3c826b160c
Merge "Add an intent extra to force master clear" into nyc-mr1-dev
2016-06-01 17:13:15 +00:00
Benjamin Franz
f9d5e6a3db
Add an intent extra to force master clear
...
Currently, if a priv-app sends ACTION_MASTER_CLEAR, whilst
DISALLOW_FACTORY_RESET is set, the factory reset is blocked. This CL
introduces a new extra for master clear that let's the priv-app bypass
the user restriction.
Bug: 28689894
Change-Id: I4bf979a3826454e977f1abff4562f85c8d0eec4a
2016-06-01 15:45:59 +01:00
Wei Wang
2ab4ac3835
Merge "Trigger power hints for activity launch" into nyc-mr1-dev
2016-06-01 03:06:38 +00:00
Wei Wang
98f03f98ac
Trigger power hints for activity launch
...
BUG: 28220567
Change-Id: Id2a0397efd1dd02ee50d5626edaed9e60ea6de8a
2016-05-31 18:34:01 -07:00
TreeHugger Robot
5df14a60cf
Merge "Helper method to check if current user is a demo user" into nyc-mr1-dev
2016-05-27 19:21:41 +00:00
Amith Yamasani
d35a89cd80
Helper method to check if current user is a demo user
...
Bug: 27280140
Change-Id: I7f6ed3198a42b4f8b81b54764e0b73499a94f77c
2016-05-27 11:13:00 -07:00
TreeHugger Robot
aabbfc5565
Merge "Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""" into nyc-mr1-dev
2016-05-27 17:36:43 +00:00
Ruchi Kandoi
e9f42318f6
Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev
...
am: 7730e57dc6
2016-05-27 16:28:03 +00:00
Amith Yamasani
ea1b9d7958
Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""
...
Added the missing import.
This reverts commit c51e725644
2016-05-27 09:25:37 -07:00
Ruchi Kandoi
7730e57dc6
Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev
2016-05-27 16:20:43 +00:00
Bart Sears
c51e725644
Revert "Remove ActivityManager calls with PM.mInstallLock held"
...
This reverts commit ac06a4907b
2016-05-27 04:18:50 +00: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
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
Ruchi Kandoi
c45908d196
PowerManager: Adds Documentation to
...
isSustainedPerformanceModeSupported()
Bug: 28775592
Change-Id: Iea4f77d2508141ac0748165f68e6e1ca235ab804
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com >
2016-05-26 11:18:52 -07: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
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
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
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
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
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
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
Amith Yamasani
dbf0dbd8c2
Merge "Retail mode flag and some clients for it" into nyc-mr1-dev
2016-05-18 20:57:12 +00:00
Yohei Yukawa
31884efd13
Merge "Move LocaleList to avoid layering violation." into nyc-dev
2016-05-18 02:14:26 +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
Zoltan Szatmary-Ban
690c2ea117
Merge "Introduce system API to get source of user restriction" into nyc-dev
2016-05-17 15:16:56 +00:00
TreeHugger Robot
fec0d188c1
Merge "Don't show new-window item in Downloads per Gabe." into nyc-dev
2016-05-13 17:26:46 +00:00
Dianne Hackborn
b3edcd78d2
Merge "Fix issue #28400000 : Settings memory UI still showing z-ram..." into nyc-dev
2016-05-12 00:40:18 +00:00
Dianne Hackborn
ef0a402f58
Fix issue #28400000 : Settings memory UI still showing z-ram...
...
...but probably shouldn't.
Keep track of whether zram is being included in per-process pss and,
if so, don't add it on separately.
Change-Id: Ic945fc3deca8412272bb6019fe1be4b878cb763a
2016-05-11 14:21:07 -07:00
Fyodor Kupolov
fdc675968c
Merge "Push unlocking/unlocked state to UserManager" into nyc-dev
2016-05-11 00:27:48 +00:00
Steve McKay
f570c771f2
Don't show new-window item in Downloads per Gabe.
...
Also, fix regression...don't show "internal storage" option in Downloads.
All other modes, fix inconsistencies in presentation of
internal-storage/new-windows commands by eliminating launch mode inference.
Update VolumeInfo and MTP provider to send correct launch mode extra.
Bug: 28691735,28695347
Change-Id: Ic480925f4c8f1beee4da104a2259c1ce5f28a6a1
2016-05-10 16:25:58 -07:00
Paul Crowley
f829c1463b
Merge "Revert "Two phases to set the password for disk encryption"" into nyc-dev
2016-05-10 21:07:59 +00:00
Paul Crowley
a1eb750e75
Revert "Two phases to set the password for disk encryption"
...
This reverts commit 17e5dce511
2016-05-10 20:36:56 +00:00
