drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not eject internal ASECs when storage unmounted

Browse Source 
If the incoming request is to notify of storage unmounted, don't mess
with apps that are in internal ASECs.

Bug: 6948035
Change-Id: I63ffb895c4d994ee03a5a9bd6bb23f69c88e2a87
This commit is contained in:
Kenny Root
2012-08-09 13:36:16 -07:00
parent ea31b47a72
commit 438a0efcfb
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/java/com/android/server/pm/PackageManagerService.java
View File

@ -8833,7 +8833,7 @@ public class PackageManagerService extends IPackageManager.Stub {
// little while. // little while.
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
public void run() { public void run() {
updateExternalMediaStatusInner(mediaStatus, reportStatus); updateExternalMediaStatusInner(mediaStatus, reportStatus, true);
} }
}); });
} }
@ -8843,7 +8843,7 @@ public class PackageManagerService extends IPackageManager.Stub {
* Should block until all the ASEC containers are finished being scanned. * Should block until all the ASEC containers are finished being scanned.
*/ */
public void scanAvailableAsecs() { public void scanAvailableAsecs() {
updateExternalMediaStatusInner(true, false); updateExternalMediaStatusInner(true, false, false);
} }
/* /*
@ -8852,7 +8852,8 @@ public class PackageManagerService extends IPackageManager.Stub {
* Please note that we always have to report status if reportStatus has been * Please note that we always have to report status if reportStatus has been
* set to true especially when unloading packages. * set to true especially when unloading packages.
*/ */
private void updateExternalMediaStatusInner(boolean isMounted, boolean reportStatus) { private void updateExternalMediaStatusInner(boolean isMounted, boolean reportStatus,
boolean externalStorage) {
// Collection of uids // Collection of uids
int uidArr[] = null; int uidArr[] = null;
// Collection of stale containers // Collection of stale containers
@ -8890,6 +8891,14 @@ public class PackageManagerService extends IPackageManager.Stub {
continue; continue;
} }
/*
* Skip packages that are not external if we're unmounting
* external storage.
*/
if (externalStorage && !isMounted && !isExternal(ps)) {
continue;
}
final AsecInstallArgs args = new AsecInstallArgs(cid, isForwardLocked(ps)); final AsecInstallArgs args = new AsecInstallArgs(cid, isForwardLocked(ps));
// The package status is changed only if the code path // The package status is changed only if the code path
// matches between settings and the container id. // matches between settings and the container id.