Commit Graph

3179 Commits

Author SHA1 Message Date
Dianne Hackborn
bc2d5fe818 Merge "Fix issue #25817435: Batterystats missing UIDs for secondary users" into nyc-dev am: 966f1c9
am: d6b6709

* commit 'd6b6709b21a99797be472a997ebd18d1d1f25c0f':
  Fix issue #25817435: Batterystats missing UIDs for secondary users
2016-03-25 02:00:05 +00:00
Dianne Hackborn
966f1c9348 Merge "Fix issue #25817435: Batterystats missing UIDs for secondary users" into nyc-dev 2016-03-25 01:50:33 +00:00
Ruben Brunk
a0148b8903 Merge "Allow current VrListenerService to read thermal info." into nyc-dev am: 41f02e5
am: 328ca70

* commit '328ca707537e18f313fe6c5642bca1e7d8d123fc':
  Allow current VrListenerService to read thermal info.
2016-03-25 01:14:07 +00:00
Ruben Brunk
41f02e5d50 Merge "Allow current VrListenerService to read thermal info." into nyc-dev 2016-03-25 01:08:18 +00:00
Dianne Hackborn
9cfba35020 Fix issue #25817435: Batterystats missing UIDs for secondary users
Change-Id: I9ad907571f04b5825d234758347659544a4de6ab
2016-03-24 17:31:28 -07:00
Felipe Leme
fe66a2b3f0 Merge "Removed obsolete @NonNull." into nyc-dev am: 657c2fa
am: 8127d6f

* commit '8127d6f04fcfc316ae8c5b7ca38cad8c610e3d53':
  Removed obsolete @NonNull.
2016-03-24 23:01:18 +00:00
Felipe Leme
541af9b119 Removed obsolete @NonNull.
BUG: 27676858
Change-Id: Ic3916769c1fa9d557294bcdbbc94e00c68376a5d
2016-03-23 16:05:57 -07:00
Felipe Leme
8bd2c937c7 Merge "Allow Scoped Directory Access on whole volume." into nyc-dev am: 9eb5555
am: b4fb50f

* commit 'b4fb50f8ccd8840c3f5179d8733a9cb0f002eebd':
  Allow Scoped Directory Access on whole volume.
2016-03-23 18:07:22 +00:00
Felipe Leme
9eb5555aa6 Merge "Allow Scoped Directory Access on whole volume." into nyc-dev 2016-03-23 17:58:48 +00:00
Ruben Brunk
8f1d5cbabb Allow current VrListenerService to read thermal info.
Bug: 27549685
Bug: 22855417
Change-Id: I2d0cb85b54767876bcbf503b5f198bd7f4065680
2016-03-23 08:23:15 -07:00
Aga Wronska
92b77f13f1 Merge "Add config flag to show/hide internal storage. Hide internal storage by default." into nyc-dev am: 5f7d673
am: c9f5b17

* commit 'c9f5b17df45fe9ee3952c4d0e6d067fc0aa43a82':
  Add config flag to show/hide internal storage. Hide internal storage by default.
2016-03-22 17:11:42 +00:00
Aga Wronska
5f7d673f3b Merge "Add config flag to show/hide internal storage. Hide internal storage by default." into nyc-dev 2016-03-22 17:04:28 +00:00
Tony Mak
fe5cd89cb9 Revert getUserInfo change and add isManagedPorfile(int userId) am: 8673b28
am: 438b3f2

* commit '438b3f218dbf3e0fe33676afe5e1e4fcfd4f2dcc':
  Revert getUserInfo change and add isManagedPorfile(int userId)
2016-03-22 15:32:58 +00:00
Tony Mak
8673b2899e Revert getUserInfo change and add isManagedPorfile(int userId)
Bug: 26469166
Change-Id: I60b70170ddc80432fc8f638b1f63c4e9f5212785
2016-03-22 15:26:05 +00:00
Jeff Sharkey
e6ee62d4c4 Merge "Store trace files in app-specific dirs." into nyc-dev am: a17b7d0
am: 95e0922

* commit '95e092228e1a8d306b369f3d402c8def3243b4a9':
  Store trace files in app-specific dirs.
2016-03-22 15:22:00 +00:00
Jeff Sharkey
a17b7d0163 Merge "Store trace files in app-specific dirs." into nyc-dev 2016-03-22 15:12:44 +00:00
Lorenzo Colitti
c54447ddbe Merge "Delete dead code." into nyc-dev am: 3527a2f
am: 2cacf7c

* commit '2cacf7c1ec0c9f04c541c2ae090064e194dad120':
  Delete dead code.
2016-03-22 11:45:34 +00:00
Lorenzo Colitti
bf4a6574b1 Delete dead code.
Change-Id: If8052efaa00f15e5c7eb038435be33206d54276a
2016-03-22 16:27:41 +09:00
Aga Wronska
1719b3555d Add config flag to show/hide internal storage.
Hide internal storage by default.

Revert "Always show intern storage."

This reverts commit 7c4395804e.

Bug: 27683276

Change-Id: I04ea8b9a307babcea003f9bec200d41265a42c7f
2016-03-21 17:33:27 -07:00
Jeff Sharkey
3a6e0ec223 Store trace files in app-specific dirs.
The previous default location of "/sdcard" became painful to use
starting in M, because it required a runtime permission.  So now we
default to storing trace files in app-specific directories on shared
storage, which apps always have write access to with no additional
permissions.

Update docs to be consistent between all overloads.

Bug: 22807654
Change-Id: If4feca7c8778dfdf4ccce8cfb68418dc416260b5
2016-03-21 16:54:11 -06:00
Felipe Leme
db892b84e5 Allow Scoped Directory Access on whole volume.
There are some scenarios where an app needs access to the whole SD Card,
not subdirectories. For example, user might have a SDCard with
directories like vacation_pictures (instead of Pictures/vacation);
another example is a file management app.

BUG: 27676858
Change-Id: I20ef713de7e4dfa7e2d7d07bab11898af186d673
2016-03-21 14:25:17 -07:00
Polina Bondarenko
4c673bc676 Merge "Added skin temperature, thresholds to HardwarePropertiesManager" into nyc-dev am: c1d317f
am: 1924d23

* commit '1924d238e3d55ffd04349a3d130933f5f1d667fc':
  Added skin temperature, thresholds to HardwarePropertiesManager
2016-03-19 19:41:43 +00:00
Polina Bondarenko
eb84552ef0 Added skin temperature, thresholds to HardwarePropertiesManager
Bug: 27425887
Change-Id: I13f69ae37906b71d93edbf6bea6daf809d97cfd5
2016-03-19 10:49:18 +00:00
Dianne Hackborn
2d9b2b98ef Merge "Fix issue #27653326: Sync doesn\'t work in doze maintenance" into nyc-dev am: bf949ce
am: 23430bf

* commit '23430bf34ce51fd60ba9738913cf2a600384786a':
  Fix issue #27653326: Sync doesn't work in doze maintenance
2016-03-19 01:00:06 +00:00
Dianne Hackborn
2fefbcf0d1 Fix issue #27653326: Sync doesn't work in doze maintenance
Add a (configurable) delay between when we start a maintenance
window until the minimum time we will end it.

Also switch to using the alarm manager callback API.  (Yay!)

Also fix a little printing problem in the alarm manager dump
so we put the package name and not some class hash in the
summary string of an alarm entry.

Change-Id: I4281e5c80bc8b26ebc1fb6f603ec33ec0e379daa
2016-03-18 16:52:30 -07:00
Jeff Sharkey
4621029922 Merge "Mark more Bundles as being defusable." into nyc-dev am: 620a28b
am: c012cf2

* commit 'c012cf26869e432adf8461e7134f117d95f239e2':
  Mark more Bundles as being defusable.
2016-03-18 20:09:53 +00:00
Jeff Sharkey
620a28bad2 Merge "Mark more Bundles as being defusable." into nyc-dev 2016-03-18 19:54:52 +00:00
Tony Mantler
2f69f042e0 Merge "Add safe-mode reboot to PowerManager" into nyc-dev am: e6e08b4
am: 6f61fd5

* commit '6f61fd538ece71095c686d73991d91138bb5e011':
  Add safe-mode reboot to PowerManager
2016-03-18 18:50:56 +00:00
Tony Mantler
e6e08b4a5a Merge "Add safe-mode reboot to PowerManager" into nyc-dev 2016-03-18 18:40:21 +00:00
Tony Mantler
b8009fddd8 Add safe-mode reboot to PowerManager
b/12787723

Change-Id: If7e6ff63532b49b9e758db290a877f7dbfa8a8b7
2016-03-18 11:36:16 -07:00
Jeff Sharkey
a04c7a7c64 Mark more Bundles as being defusable.
They're destined for the system, so they're okay to look inside.

Bug: 27726127
Change-Id: Ic85c308a8efe6f9b8652952717c72b3c663d328a
2016-03-18 12:20:39 -06:00
Jeff Sharkey
70a6fd4ce4 Merge "Update direct boot related documentation." into nyc-dev am: 2a4e495
am: a903fd7

* commit 'a903fd76262f61fa09bb5a09ad130ce8ca01ff40':
  Update direct boot related documentation.
2016-03-18 16:37:20 +00:00
Jeff Sharkey
2a4e495448 Merge "Update direct boot related documentation." into nyc-dev 2016-03-18 16:32:16 +00:00
Jeff Sharkey
cf3f0a11a8 Update direct boot related documentation.
Also hide a few APIs as requested by council.  Add a method to
easily determine if a given File would already be encrypted at rest
by the OS.

Bug: 27531029
Change-Id: Icad5f1cd56411ad3ac707db85fd7449acdcc4b94
2016-03-17 19:58:05 -06:00
Phil Weaver
1977da4488 Merge "Treat accessibility actions as user activity" into nyc-dev am: 6fdd3af
am: 5d9c243

* commit '5d9c2436f22008937e2829c34aa35103abbafcdd':
  Treat accessibility actions as user activity
2016-03-17 22:27:26 +00:00
Phil Weaver
6fdd3afdcc Merge "Treat accessibility actions as user activity" into nyc-dev 2016-03-17 22:19:17 +00:00
Jeff Sharkey
78bcc89df4 Merge "Refactoring FBE APIs based on council feedback." into nyc-dev am: a0a58a2
am: 5a128c4

* commit '5a128c4f33aa38d3a35b5884519f6bd3a355512d':
  Refactoring FBE APIs based on council feedback.
2016-03-17 22:09:46 +00:00
Jeff Sharkey
8a372a0a28 Refactoring FBE APIs based on council feedback.
Mostly consists of removing the word "encryption" from most APIs,
since we can't actually make promises about the data being encrypted.

Bug: 27531029
Change-Id: Iace9d7c4e64716abf86ed11847c40f3947e1d625
2016-03-17 14:49:08 -06:00
Daichi Hirono
c05301bee7 Merge "Add suffix number when copying a file." into nyc-dev am: 1360868
am: 43202e7

* commit '43202e7d0de2b244ba0544e2a5dfa00f64e78777':
  Add suffix number when copying a file.
2016-03-17 18:55:11 +00:00
Jeff Sharkey
8a52153c85 Merge "Oops, missed a default Bundle flag." into nyc-dev am: e6031bf
am: da9a840

* commit 'da9a840c9b766b6c797d63fe104d422699a55cdd':
  Oops, missed a default Bundle flag.
2016-03-17 18:55:09 +00:00
Jeff Sharkey
7029a23b38 Merge "Defuse Bundles parsed by the system process." into nyc-dev am: c4b0ade
am: a0f6318

* commit 'a0f6318f44244ec4e916d3abecf157beb4fefc8c':
  Defuse Bundles parsed by the system process.
2016-03-17 18:54:28 +00:00
Phil Weaver
da80d676c7 Treat accessibility actions as user activity
Resurrecting ag/665912.

Bug: 19531976
Change-Id: Ibdddd507215e61b9f4313c36eab8845e9940a7ac
2016-03-17 10:09:39 -07:00
Daichi Hirono
1360868de8 Merge "Add suffix number when copying a file." into nyc-dev 2016-03-17 04:53:35 +00:00
Daichi Hirono
fc7fb7533f Add suffix number when copying a file.
If we have an existing file in the destination directory, which has the
same name with the source file, adding suffix number is
DocumentsProvider's responsibility.

Because MTP does not provide a way to check existance of files with
given name, the logic is implemented as try-and error strategy. The CL
lets If we MtpDocumentsProvider assume we have a file that shares the
same name with the source file if it failed to invoke
MtpDevice#sendObjectInfo. In this case MtpDocumentsProvider retry to
invoke sendObjectInfo with new name with suffix number.

BUG=26991190

Change-Id: I223ac5031f079bc91eb27709b0356f621a1ed55b
2016-03-17 13:52:21 +09:00
Jeff Sharkey
7410fb4b39 Oops, missed a default Bundle flag.
Bug: 27706598
Change-Id: Idde1c25ea1b5944657075cd5f0da65396280f757
2016-03-16 21:23:31 -06:00
Jeff Sharkey
d136e51a99 Defuse Bundles parsed by the system process.
It's easy for apps to throw custom Parcelables into Bundles, but
if the system tries peeking inside one of these Bundles, it triggers
a BadParcelableException.  If that Bundle was passed away from the
Binder thread that delivered it into the system, we end up with a
nasty runtime restart.

This change mitigates this trouble by "defusing" any Bundles parsed by
the system server.  That is, if it encounters BadParcelableException
while unpacking a Bundle, it logs and delivers an empty Bundle as
the result.

Simultaneously, to help catch the system process sticking its
fingers into Bundles that are destined for other processes, a Bundle
now tracks if it's "defusable."  For example, any Intents delivered
through ActivityThread are marked as being defusable, since they've
arrived at their final destination.  Any other Bundles are considered
to be "in transit" and we log if the system tries unparceling them.

Merges several Parcel boolean fields into a flags int.  Add better
docs to several classes.

Bug: 27581063
Change-Id: I28cf3e7439503b5dc9a429bafae5eb48f21f0d93
2016-03-16 14:45:26 -06:00
Tony Mak
611bff36f8 Fix NotificationListenerService fail to mirror work notification am: 4dc008c
am: 63dbf9c

* commit '63dbf9c2165ae7963d857e396237864ebceab3ee':
  Fix NotificationListenerService fail to mirror work notification
2016-03-16 11:30:57 +00:00
Tony Mak
4dc008cda2 Fix NotificationListenerService fail to mirror work notification
1. Instead of getting application info in runtime, just retrieve the
   one in the context to avoid cross user operation.

2. Functions in PackageManager that retrieve badged icon now return
   badged icon if the targer user is managed profile instead of checking
   whether target user is a managed profile of the user in mContext.

3. Relax the restriction of getUserInfo, if the caller is asking a user
   in the same profile group or having the manage user permission, we let
   it go.

Bug: 26469166

Change-Id: Ia1ffc5743f7d94bd489cdb7571eaed51499ebdd9
2016-03-16 10:49:02 +00:00
Tao Bao
14c59725ae Merge "Don\'t reboot into recovery if block map file is missing." into nyc-dev am: 1b478f756a
am: 688b9e8a06

* commit '688b9e8a06a3ea88623d24acbabd234c336bfb31':
  Don't reboot into recovery if block map file is missing.
2016-03-15 22:10:09 +00:00
Tao Bao
36baafe92c Don't reboot into recovery if block map file is missing.
We added a third parameter to RecoverySystem.installPackage() to let the
caller to indicate the package has been processed (uncrypt'd). We need
to ensure the caller's claim is true by checking the existence of the
block map. Otherwise the device will fail for sure when booting into
recovery.

Bug: 27620932
Change-Id: I6325455253480055f14eb0cf020689ac37328602
2016-03-15 10:36:19 -07:00