Commit Graph

3220 Commits

Author SHA1 Message Date
Bart Sears
c51e725644 Revert "Remove ActivityManager calls with PM.mInstallLock held"
This reverts commit ac06a4907b.

Change-Id: I27bedbd221a8d416b9040a96063e66a1ca69fe2e
2016-05-27 04:18:50 +00:00
Fyodor Kupolov
5d531e4f6c Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev
am: a4dbdaf5e9

* commit 'a4dbdaf5e96273dccd474e31700d84a1ad907503':
  Remove ActivityManager calls with PM.mInstallLock held

Change-Id: I3be800fc5de9fa3c06f0bf6158a0dbf2a05b165e
2016-05-27 03:05:20 +00:00
Jeff Sharkey
bda14dd987 Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
am: 36cbf5ca37

* commit '36cbf5ca378523bfa4f5394e39f5fcff2b2461de':
  Cache IMountService for isUserKeyUnlocked() calls.

Change-Id: I1ad2d1eba64a89e7a22dc86c7241f6f85a5f2a0b
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
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

* commit 'bc983c443139c7b4605f98d56bd9ad7652a9938b':
  N is API 24

Change-Id: Ic45d31eb721e9831fafd5413ce60947eb7fbad7e
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

* commit 'ba2cc82399b89d92f766bbee3b2504a5cdf56215':
  Remove hidden LocaleList default constructor

Change-Id: Ia9416e9e318104dc0a29ce8b092036cf4d2b53a8
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

* commit '86f97177e959cb40229010b90f066fd602d6a06f':
  Report OTA time statistics

Change-Id: I271c156232c49a861579acd9ce90c91fbc7e5a4f
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

* commit 'bb26248bbba6e4014ea89a97b86618b7289a5f29':
  Improve performance of LocaleList with Resources

Change-Id: I307b4a7c78ff04797fda041afa8106b082951bc9
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

* commit 'd171df660e19bdba4d188beeb8b6023874712413':
  Lock down networking when waiting for always-on

Change-Id: I34fffb119eecef0052be673f307ef63c94fc58ee
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

* commit '56a9395aeb198e0a7db5e9666cc81ba7ce5f8e0d':
  Two phases to set the password for disk encryption

Change-Id: I76b3b1351ea85d8a5e42da523f57a291b3a1b0d9
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.

Bug: 28154455
Bug: 28694324
Change-Id: I8106bfba28da401b9fd38349c6a9fa9a24f54712
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.

Bug: 28694324
Change-Id: I6d89bc26cb429b195c9bcf640666c495617257b7
2016-05-10 20:36:56 +00:00
Fyodor Kupolov
6c915ead38 Push unlocking/unlocked state to UserManager
Push unlocking/unlocked state to UserManagerInternal when it's changed in
UserController. Use UserManagerInternal.isUserUnlockingOrUnlocked when
updating flags for filtering in PackageManager.

Bug: 28629076
Change-Id: I8440af090f533f93870d0cff0e3871e114c37efa
2016-05-10 11:09:02 -07:00
TreeHugger Robot
3b25fd081d Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev 2016-05-09 22:03:05 +00:00
Paul Crowley
9aa6bb5a4a Merge "Two phases to set the password for disk encryption" into nyc-dev 2016-05-09 21:35:34 +00:00
Joe Onorato
168638c594 Fix a couple bad links in the javadoc for android.os.health.
Bug: 28295754
Change-Id: I3b21e204bec626e4d1c6fb8f07580c2854e364eb
2016-05-09 13:32:32 -07:00
Joe Onorato
181cada18a Flesh out the docs for the android.os.health package.
Bug: 28295754
Change-Id: I04301fbdbfb0708172adb4fd4b4a3658d5ea14eb
2016-05-09 10:32:31 -07:00
Paul Crowley
17e5dce511 Two phases to set the password for disk encryption
In one phase, we make the new password work, and in the second we make
it the only one which works ("fixation"). This means that we can set
the password in Gatekeeper between these two phases, and a crash
doesn't break things. Unlocking a user automatically fixates the
presented credential.

Bug: 28154455
Change-Id: I18812f9ce753486ce4e33b4fe2cca392b006b39c
2016-05-06 11:10:23 -07:00
Joe Onorato
1476d32b87 Add the individual wakeup alarm counts to the batterystats checkin.
Bug: 28601365
Change-Id: I94ad69eeb575f75d62bd45076184f521bd11052d
2016-05-05 14:53:25 -07:00
Zoltan Szatmary-Ban
e783460274 Introduce system API to get source of user restriction
Clients can query who has set a particular user restriction on a user.
Currently the result can be a combination of none, system/user, or admin.

Bug: 27830375
Change-Id: I50ea9db0a59ffe3abbdcbb1a436d9ace7a35a851
2016-05-05 15:03:02 +01:00
Dianne Hackborn
d8e877d27d Maybe fix issue #28457907: Pebble app crash + reboot
Fix this long-standing multi-threading issue in Bundle
when multiple threads are trying to read from a Bundle
and conflict to due unparceling.

There are two critical sections this protects: writing
the bundle in to a parcel (when it is doing this from
the bundle's already parcelled representation), and
unparcelling a bundle into its map of entries.

Change-Id: I5470002f090e63dd623a573da6c204d3b5b661f4
2016-05-04 13:43:58 -07:00
Adam Lesinski
a8018ac47a BatteryStats: Fix units on battery charge counter
The unit for the battery charge counter is in micro-Ampere-hours, not coulombs.
We store the value as uAh but display it in dumpsys as mAh.

Bug:27174034
Change-Id: Ib5cc1ee1c5c191336a3e1f18dbb12c38e833f8d0
2016-05-03 10:41:47 -07:00
Tianjie Xu
8ebedfd0d9 Merge "Set security update label in framework" into nyc-dev 2016-05-02 17:38:52 +00:00
Lorenzo Colitti
4a992cbde8 Merge changes I86257bc8,I5c2221c5 into nyc-dev
* changes:
  Use Netd's binder interface to set resolver configuration.
  Add Gservices settings for resolver configuration.
2016-05-02 12:49:19 +00:00
Pierre Imai
8e48e67827 Add Gservices settings for resolver configuration.
BUG: 25731675

Change-Id: I5c2221c5a2478fe2fa0fdf9ceeb13a932d758d33
2016-05-02 08:26:09 +00:00