Merge "Erase OBB files when removing packages" into honeycomb (11ebdd6a) · Commits · e / os / android_frameworks_base

packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -190,6 +190,7 @@ public class DefaultContainerService extends IntentService {
		while ((pkg=pm.nextPackageToClean(pkg)) != null) {
		eraseFiles(Environment.getExternalStorageAppDataDirectory(pkg));
		eraseFiles(Environment.getExternalStorageAppMediaDirectory(pkg));
		eraseFiles(Environment.getExternalStorageAppObbDirectory(pkg));
		}
		} catch (RemoteException e) {
		}

+12 −3

Original line number	Diff line number	Diff line
		@@ -4408,9 +4408,18 @@ class PackageManagerService extends IPackageManager.Stub {
		}
		}

		/**
		* Check if the external storage media is available. This is true if there
		* is a mounted external storage medium or if the external storage is
		* emulated.
		*/
		private boolean isExternalMediaAvailable() {
		return mMediaMounted \|\| Environment.isExternalStorageEmulated();
		}

		public String nextPackageToClean(String lastPackage) {
		synchronized (mPackages) {
		if (!mMediaMounted) {
		if (!isExternalMediaAvailable()) {
		// If the external storage is no longer mounted at this point,
		// the caller may not have been able to delete all of this
		// packages files and can not delete any more. Bail.
		@@ -4430,7 +4439,7 @@ class PackageManagerService extends IPackageManager.Stub {

		void startCleaningPackages() {
		synchronized (mPackages) {
		if (!mMediaMounted) {
		if (!isExternalMediaAvailable()) {
		return;
		}
		if (mSettings.mPackagesToBeCleaned.size() <= 0) {