130 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
ca3148edf1 am 6e85ad7d: resolved conflicts for merge of 80d21f2f to jb-dev-plus-aosp
* commit '6e85ad7d267f47ba3a367651a70d147725dc26ae':
  Avoid memory leak in the Shutdown confirmation dialog.
2012-06-11 12:24:54 -07:00
Jean-Baptiste Queru
6e85ad7d26 resolved conflicts for merge of 80d21f2f to jb-dev-plus-aosp
Change-Id: I44b2ba647fb3b208119d10aed3fa6fc85dddfb0d
2012-06-11 12:20:36 -07:00
Dianne Hackborn
c7e2d4a57b am 33e39aef: am 0876ab0a: Merge "Fix issue #6295373: "Package com.google.android.apps.authenticator2 has..." into jb-dev
* commit '33e39aefdf9266dc4858f7a6171f46f43ffa3ec3':
  Fix issue #6295373: "Package com.google.android.apps.authenticator2 has...
2012-06-08 11:12:27 -07:00
Dianne Hackborn
33e39aefdf am 0876ab0a: Merge "Fix issue #6295373: "Package com.google.android.apps.authenticator2 has..." into jb-dev
* commit '0876ab0ac17518c479e9dffe025884870a586d9c':
  Fix issue #6295373: "Package com.google.android.apps.authenticator2 has...
2012-06-08 11:04:13 -07:00
Dianne Hackborn
0876ab0ac1 Merge "Fix issue #6295373: "Package com.google.android.apps.authenticator2 has..." into jb-dev 2012-06-08 11:01:42 -07:00
Kenny Root
f8dc339a52 am 625b92fc: am f27f2f8f: Merge "Delete old forward-locked apps on upgrade" into jb-dev
* commit '625b92fcf7ce3237eb4894e3c41846a65022831d':
  Delete old forward-locked apps on upgrade
2012-06-08 09:23:33 -07:00
Kenny Root
625b92fcf7 am f27f2f8f: Merge "Delete old forward-locked apps on upgrade" into jb-dev
* commit 'f27f2f8f71f584471fe558845c24121e957b2cf2':
  Delete old forward-locked apps on upgrade
2012-06-08 09:19:08 -07:00
Kenny Root
f27f2f8f71 Merge "Delete old forward-locked apps on upgrade" into jb-dev 2012-06-08 09:16:40 -07:00
Kenny Root
987ad95821 am 6dd3a0d6: am 87353093: Merge "Measure ASECs for forward-locked apps" into jb-dev
* commit '6dd3a0d61f707e7f5a9338113217eadac1849e48':
  Measure ASECs for forward-locked apps
2012-06-07 17:21:39 -07:00
Dianne Hackborn
d0c5f515c0 Fix issue #6295373: "Package com.google.android.apps.authenticator2 has...
...mismatched uid: X on disk, Y in settings" errors on Froyo and Gingerbread

Deal more gracefully with the uid changing in three ways:

1. If the uid on disk has become root, then have installd change it to
   the application's uid.  This is to correct a potential case where
   installd was interrupted while linking or unlinking the libs dir,
   during which it temporarily changes the owner of the dir to root
   so that a malicious app can not get in its way.  So if the uid on
   disk has become root, we assume we can safely just change it back
   to the correct uid.

2. When scaning packages at boot, use the same "delete and rebuild data
   directory" code for third party applications as we have for system
   applications.  This allows us to at least end up in a state where the
   app will run, even if its data is lost.

3. But we really don't want to get in to case 2, so if an application
   update is being installed and we find that the uid we now have for
   the app is different than the one on disk, fail the update.  This will
   protect against for example a developer changing the sharedUserId of
   their app and getting into this bad state.

Bug: 6295373
Change-Id: Ic802fdd818ac62449ff3c61d1fff1aa4d4942f39
2012-06-07 16:57:57 -07:00
Kenny Root
6dd3a0d61f am 87353093: Merge "Measure ASECs for forward-locked apps" into jb-dev
* commit '87353093ef98f13c45c418884734460a1b09c149':
  Measure ASECs for forward-locked apps
2012-06-07 16:34:32 -07:00
Kenny Root
87353093ef Merge "Measure ASECs for forward-locked apps" into jb-dev 2012-06-07 15:40:54 -07:00
Kenny Root
8a97c0905a am 41668981: am 906272b9: Merge "Only call fixSdPermissions when appropriate" into jb-dev
* commit '41668981aeef6f56d7528d91efa0372b9f6224b2':
  Only call fixSdPermissions when appropriate
2012-06-07 14:29:15 -07:00
Kenny Root
41668981ae am 906272b9: Merge "Only call fixSdPermissions when appropriate" into jb-dev
* commit '906272b977f5bfd977ca69d0826bb95ba3fcda63':
  Only call fixSdPermissions when appropriate
2012-06-07 14:23:42 -07:00
Kenny Root
2afded11aa Measure ASECs for forward-locked apps
Forward-locked apps are mostly in ASEC containers now, so the
containers need to be measured as well.

Bug: 6606390
Change-Id: I69e9fe47aabe1e130568779a45fe8000b3ce9d4c
2012-06-07 13:23:10 -07:00
Kenny Root
c7a8999a52 Only call fixSdPermissions when appropriate
When media packages were loaded, they would lose their forward-locked
status since the flags covering it was not available when the
doPostInstall step was called.

Bug: 6611980
Change-Id: I807fcec6b61cedf7654808b704fba7de9c7c1922
2012-06-07 12:50:15 -07:00
Kenny Root
84e35eadfb Delete old forward-locked apps on upgrade
The old style forward-locked apps were in a directory called
/data/app-private but the new style forward-locked apps are in ASEC
containers. This made the upgrade path confused and it wouldn't
correctly generate the InstallArgs to delete the old file.

Bug: 6619438
Change-Id: If4323fa8701d9fc653998f5db58670b4124b9e87
2012-06-06 16:06:21 -07:00
Jeff Brown
271bc78a2c am 8363fb73: am 40ba4dad: Merge "Add a thread to handle the radio shutdown." into jb-dev
* commit '8363fb73b568d506645602c6489ce955cddde10d':
  Add a thread to handle the radio shutdown.
2012-06-02 08:20:24 -07:00
Jeff Brown
8363fb73b5 am 40ba4dad: Merge "Add a thread to handle the radio shutdown." into jb-dev
* commit '40ba4dad4c56b8a7fbae4a93a6e5385993301ad4':
  Add a thread to handle the radio shutdown.
2012-06-01 19:00:49 -07:00
Jeff Brown
b8203719bd Add a thread to handle the radio shutdown.
Protect the ShutdownThread from possible hangs in the telephony,
Bluetooth or NFC stack while turning off the radios.

Bug: 6585958
Change-Id: I6b448c854c5a0efb0eedd90437853ef2571e785b
2012-05-31 18:37:34 -07:00
Amith Yamasani
d4cb08df75 Merge "FileInputStream is not closed in "UserManager.java : readUserList()"" 2012-05-24 09:42:29 -07:00
Rich Cannings
9a69c5fce7 Merge "Added code to log the current value of the "allow unknown sources" setting after successful package installation." 2012-05-23 14:21:34 -07:00
Matt Finifter
f8a98ed4e1 Added code to log the current value of the "allow unknown sources" setting after
successful package installation.

Change-Id: Id8de7ae94e3b3b68e033c24649ca67324d894ce8
2012-05-22 16:18:20 -07:00
rich cannings
a6cfe52eb8 Allow APKs to install when verifier times out.
When app verfication is enabled and the verifier times out, allow
PackageManagerService to continue with the installation.

Bug: 6531120
Change-Id: Ic6aef755af92588e8887c918b70fb195c683b24c
2012-05-22 10:44:39 -07:00
rich cannings
3004fe8d3d Merge "Set DEFAULT_VERIFICATION_TIMEOUT to 10 seconds" 2012-05-22 10:25:16 -07:00
Kenny Root
88ab8c8de4 am 0eaeb69d: Merge "Do not bother to remove pending installs" into jb-dev
* commit '0eaeb69d1c4849da8ab1df70b84e90837193df67':
  Do not bother to remove pending installs
2012-05-22 08:57:52 -07:00
Kenny Root
14ae367cae Do not bother to remove pending installs
Pending install list is cleared if there is an error connecting to DCS,
so don't try to remove each pending install in the loop.

Change-Id: I736114878ad92136c3b8a3ca27a1f058adaba395
2012-05-21 16:57:32 -07:00
rich cannings
aa8513e171 Set DEFAULT_VERIFICATION_TIMEOUT to 10 seconds
Bug: 6531174
Change-Id: I330a765e7f03cce3633046ef989f066c2aca5562
2012-05-21 16:15:23 -07:00
Kenny Root
8101eb7a74 am ae9d040f: Merge "Wait for ASECs to be scanned before proceeding" into jb-dev
* commit 'ae9d040f715130389de3dbc3bf52e24e5f29425a':
  Wait for ASECs to be scanned before proceeding
2012-05-17 17:17:19 -07:00
Kenny Root
51a573c767 Wait for ASECs to be scanned before proceeding
Move MountService up the list, then pause waiting for MountService to
finish scanning ASECs before the services that require those packages to
be ready.

Additionally, don't automatically mark all ASEC apps as FLAG_EXTERNAL on
reboot. This prevents AppWidgets and other things from being used with
ASECs which are on internal storage.

Bug: 6445613
Change-Id: I3e0b3e244fec966814d7a5ea93de5d337aea79bd
2012-05-17 16:06:54 -07:00
Kenny Root
e262d4bdbd am 11e123f7: Merge "Check system app before removal" into jb-dev
* commit '11e123f7684378578242f5824e14ddba2f68d9ca':
  Check system app before removal
2012-05-16 19:01:30 -07:00
Kenny Root
11e123f768 Merge "Check system app before removal" into jb-dev 2012-05-16 18:59:04 -07:00
Kenny Root
87b5d7b26e Check system app before removal
Mae sure we check to see whether an app is really deleted or just
skipped.

Bug: 6494869
Change-Id: I918f16e4ccda87f7f6f67855c7a7aef435c64e20
2012-05-16 15:40:00 -07:00
Kenny Root
017c5f78d9 am 4ebaf0f1: Merge "Change thread priority for disk measurement to bg" into jb-dev
* commit '4ebaf0f1d4be34f475bb663784b40cf79b9d2184':
  Change thread priority for disk measurement to bg
2012-05-15 11:30:23 -07:00
Kenny Root
a69b7eb1fc Change thread priority for disk measurement to bg
Change the thread priority for all disk measurement and statfs calls to
background priority.

Also move the measurement fully into the measurement task since it makes
more sense.

Bug: 6332097
Change-Id: Iafc2151313ad9b14117daf67e933dccd32f68d54
2012-05-14 15:02:19 -07:00
Jeff Brown
a48816375f am 58770232: Merge "Move power HAL interactions to PowerManagerService." into jb-dev
* commit '58770232216cd735afdfd3dd53151070e06de5ce':
  Move power HAL interactions to PowerManagerService.
2012-05-11 19:35:23 -07:00
Jeff Brown
5877023221 Merge "Move power HAL interactions to PowerManagerService." into jb-dev 2012-05-11 19:32:56 -07:00
Jeff Brown
7304c34382 Move power HAL interactions to PowerManagerService.
This refactoring sets the stage for a follow-on change that
will make use additional functions of the power HAL.

Moved functionality from android.os.Power into PowerManagerService.
None of these functions make sense being called outside of the
system server.  Moving them to the PowerManagerService makes it
easier to ensure that the power HAL is initialized exactly once.

Similarly, moved ShutdownThread out of the policy package and into
the services package where it can tie into the PowerManagerService
as needed.

Bug: 6435382
Change-Id: I958241bb124fb4410d96f5d5eb00ed68d60b29e5
2012-05-11 18:42:42 -07:00
Jeff Sharkey
f2fe4cb11b am cd586258: Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev
* commit 'cd5862586ab555b53ffd0a62488843838d1aa94d':
  Enforce READ_EXTERNAL through Settings.Secure.
2012-05-11 15:49:00 -07:00
Jeff Sharkey
f53857716a Enforce READ_EXTERNAL through Settings.Secure.
Always defers to user-defined setting, when present.

Bug: 6389556
Change-Id: I079d2a41b772facfdac74eefc4c8072fc9284f97
2012-05-11 15:31:39 -07:00
Kenny Root
c4cbbb131f am 8c3906d9: Merge "Use the right flag types when creating InstallArgs" into jb-dev
* commit '8c3906d920f55ec0d42252ef8f460e6066b1d4b6':
  Use the right flag types when creating InstallArgs
2012-05-10 09:26:13 -07:00
Kenny Root
88670d816b Use the right flag types when creating InstallArgs
Need to use PackageManager.INSTALL_{EXTERNAL,FORWARD_LOCKED} for
createInstallArgs instead of ApplicationInfo.FLAG_etc for the install
args to be created correctly. If certain flags conflict, there will be a
failure to delete the package.

Change-Id: Ibd8705943371596b2f2d6c24bd071b737ca74ef4
2012-05-09 16:02:09 -07:00
Kenny Root
bb1028de0f am c29b49fa: Merge "Handle addition of system apps during OTA" into jb-dev
* commit 'c29b49faf3e193a8c72c25c6e362ac26ea0e2464':
  Handle addition of system apps during OTA
2012-05-09 01:49:01 -07:00
Kenny Root
71244f0b6c am 8a2fe268: Merge "Prune hidden system apps when removed via OTA" into jb-dev
* commit '8a2fe26873f73a7a422cadf9e5ccfd7c68bbd9ca':
  Prune hidden system apps when removed via OTA
2012-05-09 01:47:53 -07:00
Kenny Root
83ea86091b am 29bb27ef: Merge "Add encryption parameters to package installation" into jb-dev
* commit '29bb27ef90564a294d506c2ffd546ba21788aeac':
  Add encryption parameters to package installation
2012-05-09 01:45:43 -07:00
Kenny Root
208d341bbd Handle addition of system apps during OTA
If there were apps already installed that were added in a later system
OTA, bad things would happen.

If the previously installed application is an older version, simply
delete the installed application. If the system app is older than the
previously installed one, mark it as a disabled system app and use the
previoulsy installed application.

Additionally, the application will now have the correct granted
permissions.

Bug: 6251602
Change-Id: Iea444b6acac460fca1e08d4e2cbf68a258214ca6
2012-05-08 15:57:44 -07:00
Kenny Root
c52d6fd043 Prune hidden system apps when removed via OTA
System applications which had an update applied to them at some point
were in a semi-broken state when removed via an OTA. The
"updated-package" setting would stay around forever and permissions
wouldn't be revoked.

Change-Id: I908e813b5de59c0f777d9b051253b28255a1c694
2012-05-07 23:07:49 -07:00
Anonymous Coward
ceb1b0bfae Add encryption parameters to package installation
Change-Id: Ic9f8ab9f8110f08bb3c00725cfce5b8ee7b766f3
2012-05-07 16:34:49 -07:00
Kenny Root
f154df1a31 am 03f22533: Merge "Fix some problems with ASECs" into jb-dev
* commit '03f22533a7ed398351f7c98af4a91d91354a2095':
  Fix some problems with ASECs
2012-05-02 22:48:16 -07:00
Kenny Root
bf023589b3 Fix some problems with ASECs
On devices that had external storage, permissions weren't set correctly
on non-forward-locked applications. Also, moving forward locked
applications didn't work since DefaultContainerService wasn't able to
read it.

Fixed some faulty unit tests as well.

Bug: 6427212
Change-Id: I5c1f0bf5278549069c78939f0708c4c43a7d4006
2012-05-02 17:09:57 -07:00