Commit Graph

3316 Commits

Author SHA1 Message Date
The Android Automerger
10b889de7d stephenli Manually merge commit '68fffa5'
* commit '68fffa5': (23 commits)
  Fix smallest width configuration calculation
  docs: DoDS, wearable reference docs
  Switch the default text selection handles to Material style.
  docs: Noted minor API changes in release notes
  docs: added "billions" doc in Distribute>Essentials
  Remove wear design pages redirecting to design/wear
  correct the support library redirects to redirect whole path
  Stop saving ActionMenuItemView state.
  Fix iterator double-advance in ContentObserverController
  TIF: Remove the uniqueness check for track ID from notifyTracksChanged
  Update and add attributes to the JavaDoc for VectorDrawable
  Use Q=100 JPEG instead of PNG for wallpaper display
  Fix issue #28400000: Settings memory UI still showing z-ram...
  docs: Updated support library revision history for 23.4.0
  docs: Updates to notifications for DP3
  docs: Added emoji section to api overview.
  Fixed a bug where the QS was animating wrong when closing
  Fix KeyguardManager.isSecure() to observe work profile
  cherrypick from mnc-docs docs: Updated APK Signature Scheme v2 doc.
  Docs: Added new Whitelist feature to Data Saver for DP3
  ...
2016-05-12 02:10:33 +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
282e241b11 Merge "Push unlocking/unlocked state to UserManager" into nyc-dev am: fdc675968c am: 6b366a34ee
am: 5a8fb5004c

* commit '5a8fb5004ce396716660ca115e1d583c869570b7':
  Push unlocking/unlocked state to UserManager

Change-Id: I9796ecc6ded494c9ad8dd8a10600f6eae593ce01
2016-05-11 00:49:42 +00:00
Fyodor Kupolov
fdc675968c Merge "Push unlocking/unlocked state to UserManager" into nyc-dev 2016-05-11 00:27:48 +00:00
Paul Crowley
fc5b696d65 Merge "Merge "Revert "Two phases to set the password for disk encryption"" into nyc-dev am: f829c1463b am: 05190e3bbf" into nyc-mr1-dev-plus-aosp
am: b9984f2c2d

* commit 'b9984f2c2d42552c886dea220c42ad9e18447d8a':
  Revert "Two phases to set the password for disk encryption"

Change-Id: Ia194f94777f6ca499d9e044a91f83a8ad99cd325
2016-05-10 21:20:11 +00: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
Joe Onorato
9d7dda5a6e Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev am: 3b25fd081d am: bdff78d9ea
am: 64b2e26c4e

* commit '64b2e26c4ec30d8ee6829778a41029f4b691e208':
  Fix a couple bad links in the javadoc for android.os.health.

Change-Id: I4823359d436aab34b4f032b466b184dc34731146
2016-05-09 22:28:22 +00:00
Paul Crowley
ceb1d27132 Merge "Two phases to set the password for disk encryption" into nyc-dev am: 9aa6bb5a4a am: d365ddbd73
am: 5f0856afc3

* commit '5f0856afc3399e24bcdb3a862887bce5fab087f2':
  Two phases to set the password for disk encryption

Change-Id: I33698902b9eb6345ee8eef5deae043132d7eb80d
2016-05-09 22:05:25 +00: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
a1251bdd6a Merge changes I04301fbd,If6577602 into nyc-dev am: ac29617c6e am: 4240daca3a
am: adf2a6240d

* commit 'adf2a6240dd0a732ece6c8aa7733ad77ff838819':
  Flesh out the docs for the android.os.health package.
  Properly blame the correct uid for wakeup alarms that don't have a WorkSource.

Change-Id: I489a00519a7484886f946c8d640dfa3fcb6bf3a7
2016-05-09 20:28:26 +00: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
TreeHugger Robot
70c3000a31 Merge "Remove unused method from NetworkManagementService" 2016-05-06 15:57:52 +00:00
Christopher Wiley
2103e78e0c Remove unused method from NetworkManagementService
Bug: 28598325
Test: Builds

Change-Id: I6a226b3410cda4e12a9225741ec81cd12b48892f
2016-05-05 16:43:43 -07:00
Joe Onorato
6add64cd59 Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev am: 47384f90b4 am: 67af8a12ae
am: 068061ff06

* commit '068061ff061a7f5ea6196fd5a3b428cbd4d40872':
  Add the individual wakeup alarm counts to the batterystats checkin.

Change-Id: I11555166cc09298c0d6d7fa131b57875ca024a65
2016-05-05 22:32:10 +00: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
Dianne Hackborn
4e1fa3c476 resolve merge conflicts of a14aac9 to master
Change-Id: If92c42a9e6fbc3cccd24fa2677f0e4c34d65c923
2016-05-04 16:53:38 -07: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
a021b1ebfa Merge "BatteryStats: Fix units on battery charge counter" into nyc-dev am: 00194e0f24 am: 45b8afabc0
am: 2110964764

* commit '211096476447865bc243259b4e3046a766dfe754':
  BatteryStats: Fix units on battery charge counter

Change-Id: Id9117da75a7cdc3b4f9b8285de7db8a81d7cba21
2016-05-03 20:00:35 +00: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
4ca5415d01 Merge "Set security update label in framework" into nyc-dev am: 8ebedfd0d9 am: 87a51a7a7f
am: a4a0f43b6e

* commit 'a4a0f43b6efb1a845ee88c29f51c800a2071eb2d':
  Set security update label in framework

Change-Id: I882f55e797a59bfdbd4f80c5c2f721e8e8f3be03
2016-05-02 18:01:42 +00:00
Tianjie Xu
8ebedfd0d9 Merge "Set security update label in framework" into nyc-dev 2016-05-02 17:38:52 +00:00
Pierre Imai
58b12ce344 Merge changes I86257bc8,I5c2221c5 into nyc-dev am: 4a992cbde8 am: 617c9a3625
am: c8a0ebcb18

* commit 'c8a0ebcb18c12ba3d7cfede25ce51cae47489f93':
  Use Netd's binder interface to set resolver configuration.
  Add Gservices settings for resolver configuration.

Change-Id: I83cb2668c50e910a7ce3a4dede7414b4c2bfa8d9
2016-05-02 13:08:34 +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
Adam Lesinski
28468efe50 Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev am: 3cb7f6bdcd am: 132d565eac
am: 3bd94c3e8a

* commit '3bd94c3e8a34ad328125783973e5d523eb36f000':
  BatteryStats: Keep track of coulomb counter

Change-Id: I3c0bc2e5ddd001a57978fe58f7d4bd511e8a8499
2016-04-30 02:31:26 +00:00
TreeHugger Robot
3cb7f6bdcd Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev 2016-04-30 02:21:38 +00:00
Adam Lesinski
926969b411 BatteryStats: Keep track of coulomb counter
Bug:27174034
Change-Id: Ica66817faa20b9788536f28f0e593483f033904b
2016-04-29 17:40:11 -07:00
Tianjie Xu
ac75f1effa Set security update label in framework
GmsCore will use different filenames to distinguish a security update
from a normal update. (update.zip for normal update and update_s.zip for
security update.) So, if framework observes the filename as
"update_s.zip", write command "--security" to BCB. This cmd ask the
recovery image to choose the right background string for update.

Bug: 27837319
Change-Id: I2ef12267a6be57d8a81f7f9f34c09aea54530c1f
2016-04-29 16:19:30 -07:00
Andreas Gampe
e105b0bed9 Merge "Frameworks/base: Use holder in FileUtils" into nyc-dev am: ecd73f48fe am: 289da55c68
am: a4661cbbd1

* commit 'a4661cbbd12713266ab30f8e75db33aadc97a079':
  Frameworks/base: Use holder in FileUtils

Change-Id: I9e16512c1af9d67ef47291cc67df1764a42a7cd3
2016-04-29 07:20:38 +00:00
Andreas Gampe
0693fd85f6 Frameworks/base: Use holder in FileUtils
Use a holder for an uncommon Pattern instance in FileUtils.

Allows to compile-time initialize:
* android.os.FileUtils

Bug: 28174137
Change-Id: I4a7a388795a96678b4b26e4f2c02b1117d6a67f6
2016-04-28 19:33:05 -07:00
Jeff Sharkey
23d8cb4a25 Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev am: 8c2fb9edae am: 35c6f6c70a
am: c68126587a

* commit 'c68126587aab22d27cf6ad19a05cb58b5d1bad50':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: I9a24147c091c7f370923e43148b78a855fcb43be
2016-04-28 19:33:53 +00:00
Jeff Sharkey
ce18c81677 Introduce "unlocking" vs "unlocked" nuance.
There is a narrow window of time during user unlock where we're
reconciling user storage and dispatching the "unlock" status to
various internal system services.  While in this "unlocking" state,
apps need to be told that the user still isn't actually "unlocked"
so they don't try making calls to AccountManager, etc.

The majority of internal services are interested in merging together
both the "unlocking" and "unlocked" state, so update them.

Clarify naming in AccountManagerService to make it clear that a local
list is being used, which mirrors the naming in MountService.

To match UX/PM requested behavior, move PRE_BOOT_COMPLETED dispatch
after the user is unlocked, but block BOOT_COMPLETED dispatch until
after all PRE_BOOT receivers are finished to avoid ANRs.

Bug: 28040947, 28164677
Change-Id: I57af2351633d9159f4483f19657ce0b62118d1ce
2016-04-28 10:51:39 -06:00
Badhri Jagan Sridharan
bc07967a69 Merge "Add low power stats to batteryhistory" into nyc-dev am: 5149abe am: b0ec5e2
am: 90edbf9

* commit '90edbf9a2c5d5eec58643fee9c485b79910b3896':
  Add low power stats to batteryhistory

Change-Id: If3b2f1145ca38e05bf880d6471c1467d195edede
2016-04-28 00:58:08 +00:00
Badhri Jagan Sridharan
68cdf1997f Add low power stats to batteryhistory
Exports SOC specific low power state info to batterystats service.
BatteryStats service queries the powerHAL module whenever and
updates the HistoryStepDetails whenever setBatteryState is called by the
BatteryService. The stats get appended to the battery history whenever
there is a change in the battery level.

Bug: 26564574
Change-Id: I02b4db00aec0c69d1558492224f3a4dc1c386fa6
2016-04-27 13:08:40 -07:00
Kweku Adams
78502626ae Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev am: 3cabb2a am: 6c0291c
am: 5a3350b

* commit '5a3350b65c95ecb4c3252c07f1d6450dbd6a3071':
  Removing extraneous field from batterystats dumpsys.

Change-Id: Ied21cfa884915e8008bd32add81f38cf4baf26e5
2016-04-25 21:50:55 +00:00
Kweku Adams
5b2747e133 Removing extraneous field from batterystats dumpsys.
Accidentally introduced in ag/851920.

Change-Id: I89ac490cef1735defa7165e6d27beae20490091d
2016-04-25 10:44:05 -07:00
Ricky Wai
75374dbbd5 Merge "Make "work mode on dialog" show personal challenge in unified work lock" into nyc-dev am: 4ace836 am: e4c8276
am: c6002d0

* commit 'c6002d0819a23f25dfc7fc87916d5fd82a7c4a67':
  Make "work mode on dialog" show personal challenge in unified work lock

Change-Id: I2170df9c34e825783dd6bfd472b7243422b2a71c
2016-04-25 13:30:32 +00:00
Ricky Wai
7881cf8f81 Make "work mode on dialog" show personal challenge in unified work lock
Bug: 28183335
Change-Id: Ib212b283b9561f88899f6e7ea130944391b6e558
2016-04-25 10:26:14 +00:00
Svet Ganov
879f5ba3f7 Merge "Cleanup of the PackageInstaller API - Frameworks" into nyc-dev am: c947ebd am: 70d720c
am: 13da561

* commit '13da5613e2fce0ca2d5682fd202234856d2206e9':
  Cleanup of the PackageInstaller API - Frameworks

Change-Id: Ibe4a6258c6437a9e86ed25e242301ca6d6635d26
2016-04-22 22:35:29 +00:00
Svet Ganov
ae0e03a9e0 Cleanup of the PackageInstaller API - Frameworks
The PackageInstaller app manages side-loading apps as well
as permission management. It should be updatable, hence
should rely on system APIs to talk to the platform. This
is the first step of defining an API boundary.

Change-Id: I9814eafd0b22ae03b4b847a7007cdbf14c9e5466
2016-04-22 14:18:32 -07:00
Ruchi Kandoi
a30439d6cd Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev am: 316c68f144 am: fb8c76df29
am: cd3e0f594f

* commit 'cd3e0f594f8097e09094373e5e57e5b82d70624c':
  fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link

Change-Id: I53785eb2d1326ef1f59814b6cc489429619962c3
2016-04-21 02:57:25 +00:00
Ruchi Kandoi
a2689dcf71 fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link
Change-Id: Ic12b98cbafcc8c81eadba119ab416a9eddb7214a
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-04-20 17:22:27 -07:00
Ruchi Kandoi
a2b96b1c8c Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev am: 0fea8ad am: 4c24df5
am: d84169a92f

* commit 'd84169a92ffe2137a7e53c2debcde42cf2eb1878':
  Revert "PowerManager: Adds the Sustained performance API."

Change-Id: Iadb804137b77b1fd9f20da6b03c2b8e30617ed0c
2016-04-21 00:21:51 +00:00
Ruchi Kandoi
e325e5629f Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev am: a645c97 am: 75da7b4
am: a78d8d3

* commit 'a78d8d303e46b06948e4d2199f9f2942ee09138e':
  window: Adds a Sustained Performance Mode window flag.

Change-Id: I4f2c47cdaa9fa6391e73d725aebb0348ae28f0ac
2016-04-20 23:05:29 +00:00