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

Merge "Throw RemoteException when MountService is not yet up" into jb-dev

Browse Source
This commit is contained in:
Kenny Root
2012-05-09 13:27:08 -07:00
committed by Android (Google) Code Review
parent ea86b36f80 07ba2ae327
commit bad417df65
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/com/android/internal/content/PackageHelper.java
View File

@ -57,25 +57,25 @@ public class PackageHelper {
public static final int APP_INSTALL_INTERNAL = 1; public static final int APP_INSTALL_INTERNAL = 1;
public static final int APP_INSTALL_EXTERNAL = 2; public static final int APP_INSTALL_EXTERNAL = 2;
public static IMountService getMountService() { public static IMountService getMountService() throws RemoteException {
IBinder service = ServiceManager.getService("mount"); IBinder service = ServiceManager.getService("mount");
if (service != null) { if (service != null) {
return IMountService.Stub.asInterface(service); return IMountService.Stub.asInterface(service);
} else { } else {
Log.e(TAG, "Can't get mount service"); Log.e(TAG, "Can't get mount service");
throw new RemoteException("Could not contact mount service");
} }
return null;
} }
public static String createSdDir(int sizeMb, String cid, String sdEncKey, int uid, public static String createSdDir(int sizeMb, String cid, String sdEncKey, int uid,
boolean isExternal) { boolean isExternal) {
// Create mount point via MountService // Create mount point via MountService
IMountService mountService = getMountService();
if (localLOGV)
Log.i(TAG, "Size of container " + sizeMb + " MB");
try { try {
IMountService mountService = getMountService();
if (localLOGV)
Log.i(TAG, "Size of container " + sizeMb + " MB");
int rc = mountService.createSecureContainer(cid, sizeMb, "ext4", sdEncKey, uid, int rc = mountService.createSecureContainer(cid, sizeMb, "ext4", sdEncKey, uid,
isExternal); isExternal);
if (rc != StorageResultCode.OperationSucceeded) { if (rc != StorageResultCode.OperationSucceeded) {