Commit Graph

2577 Commits

Author SHA1 Message Date
Tao Bao
87212ad6a8 Clean up the uncrypted OTA package on bootup.
An OTA package needs to be uncrypted before rebooting into recovery if
it sits on an encrypted /data partition. Once uncrypt gets started, we
cannot re-run it on the package again. Because the file may have been
fully or particially uncrypted and we may end up with a corrupt file
under recovery. Always clean up the package when the device boots into
the normal system to avoid that.

Bug: 24973532
Change-Id: I91682c103d1f2b603626c4bf8d818bced71e3674
2015-10-19 14:49:09 -07:00
Daniel Erat
d3e3d8896e am c3f37589: Merge "Update instructions in IPowerManager.aidl."
* commit 'c3f37589e04a52c109c63f6411db444500d4f92c':
  Update instructions in IPowerManager.aidl.
2015-09-30 21:30:31 +00:00
Daniel Erat
22f58762e1 Update instructions in IPowerManager.aidl.
Clarify IPowerManager.aidl's instructions for keeping the
C++ implementation in sync.

Change-Id: Ic51a3844483031e71fe2cfa1d3e8a065df86d119
2015-09-30 14:55:35 -06:00
Yasuhiro Matsuda
ebf9465d21 resolved conflicts for merge of ef57e5e0 to stage-aosp-master
Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c
2015-09-02 22:57:53 +09:00
Yasuhiro Matsuda
ef57e5e03b Merge "Add trace code to system server." 2015-09-02 12:54:23 +00:00
Yasuhiro Matsuda
1ab43d5978 Add trace code to system server.
- Add TRACE_TAG_SYSTEM_SERVER for tracing system server code.
- Add a few more tracing code to the code paths related to boot.

BUG: 21739901
BUG: 22207144
Change-Id: I08b424d2f83783f512c3818394099909cd55f327
2015-08-27 12:22:07 +09:00
Jeff Sharkey
746aee22e8 am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev
* commit 'f3ad1eabc1fa5252165bfe1516690d1026507f0a':
  Pass underlying volume UUID to StorageVolume.
2015-08-20 01:33:46 +00:00
Jeff Sharkey
8e2ea2a9f1 Pass underlying volume UUID to StorageVolume.
To help MediaProvider uniquely identify storage devices, pass through
the UUID of the underlying private storage volume.

Bug: 23329611
Change-Id: I22ee7ea98fcb208d7797310acb3396a3f074f09b
2015-08-19 14:16:05 -07:00
Tao Bao
9d995335f0 am 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()."
* commit '2e3746abc7d70dd72f60a7912cd45472f3032acb':
  Recursively delete directories in handleAftermath().
2015-08-18 22:41:32 +00:00
Tao Bao
5065e12dbe Recursively delete directories in handleAftermath().
RecoverySystem.handleAftermath() is called to clean up recovery-related
files. It needs to handle non-empty directories as well such as leftover
stashes from failed OTAs.

Bug: 23199081
Change-Id: I33fb326d376d04c793ad7b5948a10e8c1c572812
2015-08-18 13:48:17 -07:00
Adam Lesinski
4fe0a44658 am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev
* commit '504600bb09e51f0187d81cacb1dc2de77c6256b6':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
2015-08-14 19:45:55 +00:00
Adam Lesinski
621e06a64d Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
System UIDs are also run as shared GIDs, so this should not throw
an exception.

Bug:23189342
Change-Id: Ia180db012c25615cde1720ae0d41d1378f7bfb1a
2015-08-13 22:06:31 -07:00
Dianne Hackborn
6d52d7616d am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
* commit 'ff9912d594bc5cdc10a4a224b9a2296bac50851b':
  Fix issue #23116383: Include security patch level in Settings
2015-08-13 00:57:51 +00:00
Dianne Hackborn
c3f7449517 Fix issue #23116383: Include security patch level in Settings
Change-Id: I4934c7d26bf69b5c599962cd74ac1e4ea4ad4b51
2015-08-12 16:10:58 -07:00
Dianne Hackborn
10faec4bc0 am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev
* commit 'f0e5501e093c688cd293308e0aafc2b55326c255':
  Fix issue #22989030: Separate battery whitelists
2015-08-07 22:06:31 +00:00
Dianne Hackborn
4a503b1ece Fix issue #22989030: Separate battery whitelists
We now have a new whitelist you can put apps in, which
opts them out of the old battery saver mode and new app idle,
but doesn't keep them from going in to doze.  This is for a few
special cases that we had previously whitelisted for battery saver,
and inherited to the new modes...  ultimately we should figure out
how to get these apps out of the whitelist completely, but this
will help for now.

Apps in this new whitelist are not shown in the UI, because they
are still significantly restricted by not being able to operate
normally in doze.  This also means they are still visible in the
list of all apps for the user to be able to put them on/off the
complete whitelist if that is what they really want.

In the course of doing this, I needed to clean up code in the
network policy manager to better separate management of the
two firewall rules that now have different whitelists applied
to them.  This also hopefully just generally simplifies and cleans
up that code.  Hopefully!

Change-Id: I92e15f2f85899571dd8b049b5e3eb1354f55f353
2015-08-07 14:23:32 -07:00
Andres Morales
84fd6e9733 am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev
* commit '85c73c40d1fd76e8a7bbd90ab80458082764c1c3':
  [UserManager] expose method to retrieve credential owner
2015-08-06 22:31:04 +00:00
Andres Morales
85c73c40d1 Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev 2015-08-06 22:22:17 +00:00
Michael Wright
46b7af57d7 am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev
* commit 'd5a6df6d228036258d616245502c1a4f85ba4b2e':
  Make the NullVibrator really null.
2015-08-06 13:59:40 +00:00
Michael Wright
d5a6df6d22 Merge "Make the NullVibrator really null." into mnc-dev 2015-08-06 13:52:34 +00:00
Andres Morales
c5548c02fe [UserManager] expose method to retrieve credential owner
Certain operations (like ConfirmCredential) can be invoked
in the context of a profile, in which case the calling code
needs to know under what profile the credential is registered.

Expose a centralized location for this information for Settings
and GateKeeper to consume.

Bug: 22257554
Change-Id: Iffe4f6a254f52d1269b9287edabcf6efa515d9d2
2015-08-05 10:50:05 -07:00
Paul Jensen
66625ff192 am dbc4edcc: Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev
* commit 'dbc4edccfced5cb739bae75e8cd15cecc39cf16e':
  Fix NOT_RESTRICTED network capability and enforce it.
2015-08-05 10:11:40 +00:00
Paul Jensen
dbc4edccfc Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev 2015-08-05 10:03:47 +00:00
Paul Jensen
487ffe7d3d Fix NOT_RESTRICTED network capability and enforce it.
With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
   special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
   permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
   CONNECTIVITY_INTERNAL permission

Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
2015-08-04 07:24:24 -04:00
Todd Kennedy
9f48590554 am 772c6c0d: am 40f0efe0: Merge "Add a trace constant for PackageManager"
* commit '772c6c0d2d62af7295030ded14b3f428ab325ef4':
  Add a trace constant for PackageManager
2015-08-03 18:05:20 +00:00
Todd Kennedy
114beb21a0 Add a trace constant for PackageManager
Change-Id: Ida391be765c63d7b6da3d9fd9d1d975e51b4f3e7
2015-08-03 09:56:07 -07:00
Yusuke Sato
c2369c5301 am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones"
* commit 'b98e235364c2b221521f622c546733b2862e4677':
  Distinguish user-requested shutdown from power-related ones
2015-07-31 23:34:06 +00:00
Dianne Hackborn
f2269f0454 Change MNC codename to just M.
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
2015-07-31 17:19:03 +00:00
Dianne Hackborn
c1836bb0f1 Merge "Change MNC codename to just M." into mnc-dev 2015-07-31 17:11:58 +00:00
Yusuke Sato
705ffd1efe Distinguish user-requested shutdown from power-related ones
With this patch, when the user requested shutdown,
PowerManagerService sets sys.powerctl is set to
"shutdown,userrequested", and init runs fsck on shutdown.

When shutdown is triggered due to a low power state etc.,
the service sets the property to "shutdown,", and init
immediately shuts down the system without running the
command.

This is a follow-up CL for http://r.android.com/158525.

Bug: 21853106
Change-Id: Iae72990130fe9aa479c802f77301438190dbbfb3
2015-07-30 23:47:13 -07:00
Adam Lesinski
1c023b5aac am 00f7cb92: Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev
* commit '00f7cb924e6964c5403c55ae5e7348aad1c8ec7b':
  BatteryStats: include mobile radio active count and unknown time in checkin
2015-07-31 00:01:42 +00:00
Adam Lesinski
00f7cb924e Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev 2015-07-30 23:50:27 +00:00
Adam Lesinski
782327bde7 BatteryStats: include mobile radio active count and unknown time in checkin
These are important values to help diagnose modem related wakeup issues.

Bug:22803686
Bug:22857991
Change-Id: Ie0164ebd194567bc10d1165d671a583674a39829
2015-07-30 23:50:10 +00:00
Michael Wright
5e829abd71 Make the NullVibrator really null.
Currently any calls into vibrate just end up in an infinite loop
until the program's stack overflows.

Bug: 22835503
Change-Id: I640c3990b597ac69d83b3656e00daad088002982
2015-07-30 15:49:50 +01:00
Dianne Hackborn
98169db36b am 8d3a67a8: Merge "More maybe fix issue #22765972: Binder transactions running out..." into mnc-dev
* commit '8d3a67a8d475b43cbac50a2a186a19f4a29c7892':
  More maybe fix issue #22765972: Binder transactions running out...
2015-07-30 01:44:08 +00:00
Dianne Hackborn
6b42bc0e21 More maybe fix issue #22765972: Binder transactions running out...
...of address space causing package manager to fail

Make sure to flush binder commands when done with an async task.

Change-Id: I9f171add7051587ab854226b97a12c7e1844ad5d
2015-07-29 17:58:33 -07:00
Dianne Hackborn
0e3de6caca Change MNC codename to just M.
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
2015-07-29 15:20:21 -07:00
Dianne Hackborn
c2a024392a am eda1cc50: Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev
* commit 'eda1cc50cead674287616e6a852f8f281b70b9f5':
  Work on issue #22765972: Binder transactions running out of address...
2015-07-29 17:19:56 +00:00
Dianne Hackborn
eda1cc50ce Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev 2015-07-29 17:05:58 +00:00
Jeff Sharkey
667f35fab8 am b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev
* commit 'b8040265dd0d5a2a96e0850623647dad2f528db1':
  Give secondary users read-only physical cards.
2015-07-29 04:04:41 +00:00
Dianne Hackborn
86cbc2bf30 Work on issue #22765972: Binder transactions running out of address...
...space causing package manager to fail

Lower the maximum IPC size we use in various places, to keep it
under the threshold of becoming dangerous.  Now everything tries
to keep not much more than 64k.

Change-Id: I814013097966a7843179e5d581bfdb254c5ae318
2015-07-28 18:13:21 -07:00
Jeff Sharkey
4634987668 Give secondary users read-only physical cards.
Long ago, we mounted secondary physical cards as readable by all
users on the device, which enabled the use-case of loading media on
a card and viewing it from all users.

More recently, we started giving write access to these secondary
physical cards, but this created a one-directional channel for
communication across user boundaries; something that CDD disallows.

This change is designed to give us the best of both worlds: the
package-specific directories are writable for the user that mounted
the card, but access to those "Android" directories are blocked for
all other users.  Other users remain able to read content elsewhere
on the card.

Bug: 22787184
Change-Id: Ied8c98995fec1b7b50ff7d930550feabb4398582
2015-07-28 14:42:34 -07:00
Jeff Sharkey
e5a0e17667 am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev
* commit 'f6e9a3ede53ae487838c19714ad62f25a4a6ca4c':
  More info to support CTS, fix reconcile bug.
2015-07-23 18:57:02 +00:00
Dianne Hackborn
eaf3de13ff am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev
* commit '6f64e737f046cd9ae13e260027781acfabaa4cba':
  Fix issue #22612630: Ensure SMS/Call delivery during Doze
2015-07-23 18:56:39 +00:00
Jeff Sharkey
f6e9a3ede5 Merge "More info to support CTS, fix reconcile bug." into mnc-dev 2015-07-22 19:40:44 +00:00
Dianne Hackborn
6f64e737f0 Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 2015-07-22 19:04:00 +00:00
Jeff Sharkey
85ced63268 More info to support CTS, fix reconcile bug.
Surface more details and commands for storage volumes to support
CTS testing.  Fix user reconciliation bug that skipped user setup on
empty volumes.

Bug: 22658804, 22633097
Change-Id: I4221312d1cce24d1f5a2c108095cf3cf471598ed
2015-07-22 11:11:50 -07:00
Dianne Hackborn
451c3468b9 Fix issue #22612630: Ensure SMS/Call delivery during Doze
Add whitelist timeout for SMS.

Change-Id: I3392093000ad177a93b6ef36fb18f0398a671423
2015-07-21 17:39:46 -07:00
Fyodor Kupolov
4dee174f72 am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
* commit '55a116d00ca3f7b84a6af1c5c3472323ad5bc6ca':
  Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
2015-07-21 20:47:45 +00:00
Fyodor Kupolov
53019287fd Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
Bug: 21521860
Change-Id: I0c2659f84589a77432317fbc89d49716027577d3
2015-07-21 12:06:14 -07:00