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

PackageManagerService: Refactor MountService calls (new api)

Browse Source 
Signed-off-by: San Mehat <san@google.com>
This commit is contained in:
San Mehat
2010-01-29 05:35:35 -08:00
parent ec7f7e6378
commit be16cb15b3
1 changed files with 58 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
services/java/com/android/server/PackageManagerService.java
View File

@ -73,6 +73,7 @@ import android.os.Environment;
import android.os.FileObserver; import android.os.FileObserver;
import android.os.FileUtils; import android.os.FileUtils;
import android.os.Handler; import android.os.Handler;
import android.os.MountServiceResultCode;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.os.Process; import android.os.Process;
import android.os.ServiceManager; import android.os.ServiceManager;
@ -7940,33 +7941,28 @@ class PackageManagerService extends IPackageManager.Stub {
Log.e(TAG, "Failed to create encryption keys with exception: " + nsae); Log.e(TAG, "Failed to create encryption keys with exception: " + nsae);
return null; return null;
} }
try {
cachePath = mountService.createSecureContainer(pkgName, int rc = mountService.createSecureContainer(
mbLen, pkgName, mbLen, "vfat", sdEncKey, Process.SYSTEM_UID);
"vfat", sdEncKey, Process.SYSTEM_UID); if (rc != MountServiceResultCode.OperationSucceeded) {
if (DEBUG_SD_INSTALL) Log.i(TAG, "Trying to install " + pkgName + ", cachePath =" + cachePath); Log.e(TAG, String.format("Failed to create container (%d)", rc));
return cachePath;
} catch(IllegalStateException e) { rc = mountService.destroySecureContainer(pkgName);
Log.e(TAG, "Failed to create storage on sdcard with exception: " + e); if (rc != MountServiceResultCode.OperationSucceeded) {
Log.e(TAG, String.format("Failed to cleanup container (%d)", rc));
return null;
}
rc = mountService.createSecureContainer(
pkgName, mbLen, "vfat", sdEncKey, Process.SYSTEM_UID);
if (rc != MountServiceResultCode.OperationSucceeded) {
Log.e(TAG, String.format("Failed to create container (2nd try) (%d)", rc));
return null;
}
} }
// TODO just fail here and let the user delete later on.
try { cachePath = mountService.getSecureContainerPath(pkgName);
mountService.destroySecureContainer(pkgName); if (DEBUG_SD_INSTALL) Log.i(TAG, "Trying to install " + pkgName + ", cachePath =" + cachePath);
if (DEBUG_SD_INSTALL) Log.i(TAG, "Destroying cache for " + pkgName + ", cachePath =" + cachePath);
} catch(IllegalStateException e) {
Log.e(TAG, "Failed to destroy existing cache: " + e);
return null;
}
try {
cachePath = mountService.createSecureContainer(pkgName,
mbLen,
"vfat", sdEncKey, Process.SYSTEM_UID);
if (DEBUG_SD_INSTALL) Log.i(TAG, "Trying to install again " + pkgName + ", cachePath =" + cachePath);
return cachePath; return cachePath;
} catch(IllegalStateException e) {
Log.e(TAG, "Failed to create storage on sdcard with exception: " + e);
return null;
}
} }
private String mountSdDir(String pkgName, int ownerUid) { private String mountSdDir(String pkgName, int ownerUid) {
@ -7975,64 +7971,53 @@ class PackageManagerService extends IPackageManager.Stub {
Log.e(TAG, "Failed to retrieve encryption keys to mount package code: " + pkgName + "."); Log.e(TAG, "Failed to retrieve encryption keys to mount package code: " + pkgName + ".");
return null; return null;
} }
try {
return getMountService().mountSecureContainer(pkgName, sdEncKey, ownerUid); int rc = getMountService().mountSecureContainer(pkgName, sdEncKey, ownerUid);
} catch (IllegalStateException e) {
Log.i(TAG, "Failed to mount container for pkg : " + pkgName + " exception : " + e); if (rc != MountServiceResultCode.OperationSucceeded) {
Log.i(TAG, "Failed to mount container for pkg : " + pkgName + " rc : " + rc);
return null;
} }
return null;
return getMountService().getSecureContainerPath(pkgName);
} }
private boolean unMountSdDir(String pkgName) { private boolean unMountSdDir(String pkgName) {
// STOPSHIP unmount directory // STOPSHIP unmount directory
try { int rc = getMountService().unmountSecureContainer(pkgName);
getMountService().unmountSecureContainer(pkgName); if (rc != MountServiceResultCode.OperationSucceeded) {
return true; Log.e(TAG, "Failed to unmount : " + pkgName + " with rc " + rc);
} catch (IllegalStateException e) {
Log.e(TAG, "Failed to unmount : " + pkgName + " with exception " + e);
}
return false;
}
private String getSdDir(String pkgName) {
String cachePath = null;
try {
cachePath = getMountService().getSecureContainerPath(pkgName);
} catch (IllegalStateException e) {
Log.e(TAG, "Failed to retrieve secure container path for pkg : " + pkgName + " with exception " + e);
}
return cachePath;
}
private boolean finalizeSdDir(String pkgName) {
try {
getMountService().finalizeSecureContainer(pkgName);
return true;
} catch (IllegalStateException e) {
Log.i(TAG, "Failed to destroy container for pkg : " + pkgName);
return false; return false;
} }
return true;
} }
private boolean destroySdDir(String pkgName) { private String getSdDir(String pkgName) {
try { return getMountService().getSecureContainerPath(pkgName);
// We need to destroy right away }
getMountService().destroySecureContainer(pkgName);
return true;
} catch (IllegalStateException e) {
Log.i(TAG, "Failed to destroy container for pkg : " + pkgName);
return false;
}
}
static String[] getSecureContainerList() { private boolean finalizeSdDir(String pkgName) {
try { int rc = getMountService().finalizeSecureContainer(pkgName);
return getMountService().getSecureContainerList(); if (rc != MountServiceResultCode.OperationSucceeded) {
} catch (IllegalStateException e) { Log.i(TAG, "Failed to finalize container for pkg : " + pkgName);
Log.i(TAG, "Failed to getSecureContainerList"); return false;
} }
return null; return true;
} }
private boolean destroySdDir(String pkgName) {
int rc = getMountService().destroySecureContainer(pkgName);
if (rc != MountServiceResultCode.OperationSucceeded) {
Log.i(TAG, "Failed to destroy container for pkg : " + pkgName);
return false;
}
return true;
}
static String[] getSecureContainerList() {
String[] list = getMountService().getSecureContainerList();
return list.length == 0 ? null : list;
}
static String getTempContainerId() { static String getTempContainerId() {
String prefix = "smdl1tmp"; String prefix = "smdl1tmp";