Commit Graph

3344 Commits

Author SHA1 Message Date
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

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

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

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

Change-Id: I4160a61ca437d20df4342a44ed24fc6ad47962c6
2016-05-18 23:47:52 +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

* commit '02826bb36b023ba80b88ada743ac32b534a2c380':
  Two phases to set the password for disk encryption

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

* 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
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

* commit '1ab19ea6e6575a578244eecbae61d46150bec392':
  Retail mode flag and some clients for it

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

* commit 'bf4c8f730b167e5ee65ed7c59dfa1d7867b63fcc':
  Move LocaleList to avoid layering violation.

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

* commit '269f64079b34eb178a33dba306d610c8dfb322c4':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

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

Bug: 28154455
Bug: 28694324
Change-Id: I8106bfba28da401b9fd38349c6a9fa9a24f54712
2016-05-17 15:22:29 -07:00
Ian Rogers
660e6def20 Fix bug where FileUtils.deleteOlderFiles wouldn't delete the oldest files.
Bug: 24116825
Change-Id: I1e6ec28afbb097a882a19a9b1ede4cb971cb5998
2016-05-17 11:50:54 -07:00
Robert Sesek
94e824bc1b Split the zygote logic out of android.os.Process into a new ZygoteProcess class.
There is no functional change. This is to support adding new types of zygotes
that all operate using the same protocol.

Bug: 21643067
Change-Id: Ie673ee816cae34ac20ffb8c774ec3e6461c3fd0a
2016-05-17 14:11:01 -04:00
Zoltan Szatmary-Ban
e0267426c2 Merge "Introduce system API to get source of user restriction" into nyc-dev am: 690c2ea117 am: 07e232371f
am: 96489e0c2a

* commit '96489e0c2a370b970fc243a23ccfb3e0a73d0298':
  Introduce system API to get source of user restriction

Change-Id: Id368f8b1a096a86195097ba87a18539f0558a72a
2016-05-17 15:33:28 +00: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
Felipe Leme
1849dbb7b6 Added a getPrimaryStorageSize() method.
BUG: 24128505

Change-Id: I0b75d3c5505dadedf5d06868614b3a01765cc5d3
2016-05-16 14:53:48 -07:00
Steve McKay
935d7d6854 Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev am: fec0d188c1 am: 6fdaf2f2cf
am: b8995b7abc

* commit 'b8995b7abc9cbaa1dcb363c68535a63f4e8768a3':
  Don't show new-window item in Downloads per Gabe.

Change-Id: I54d288582f474ed1a0718a3f6327af7f1814be75
2016-05-13 17:42:44 +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
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
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
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
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
4e1fa3c476 resolve merge conflicts of a14aac9 to master
Change-Id: If92c42a9e6fbc3cccd24fa2677f0e4c34d65c923
2016-05-04 16:53:38 -07:00