Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Throw RemoteException when MountService is not yet up

Browse Source 
Instead of throwing NullPointerException when getMountService() returns
null, simply throw RemoteException so the code calling getMountService()
can fail gracefully.

Bug: 6461657
Change-Id: Ibefc17de3e0024eb73bbd24914759c0a404f538e
This commit is contained in:
Kenny Root
2012-05-09 09:14:28 -07:00
parent 2f4b10e2d4
commit 07ba2ae327
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_EXTERNAL = 2;
public static IMountService getMountService() {
public static IMountService getMountService() throws RemoteException {
IBinder service = ServiceManager.getService("mount");
if (service != null) {
return IMountService.Stub.asInterface(service);
} else {
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,
boolean isExternal) {
// Create mount point via MountService
IMountService mountService = getMountService();
if (localLOGV)
Log.i(TAG, "Size of container " + sizeMb + " MB");
try {
IMountService mountService = getMountService();
if (localLOGV)
Log.i(TAG, "Size of container " + sizeMb + " MB");
int rc = mountService.createSecureContainer(cid, sizeMb, "ext4", sdEncKey, uid,
isExternal);
if (rc != StorageResultCode.OperationSucceeded) {