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

Merge "Asec: Add new 'StorageNotFound' response code handling for container paths"

Browse Source
This commit is contained in:
San Mehat
2010-03-23 11:25:31 -07:00
committed by Android (Google) Code Review
parent 1c4027b68d 2d66cef77e
commit a89e372db2
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/java/com/android/server/MountService.java
View File

@@ -100,6 +100,7 @@ class MountService extends IMountService.Stub
public static final int OpFailedMediaCorrupt = 403;
public static final int OpFailedVolNotMounted = 404;
public static final int OpFailedStorageBusy = 405;
public static final int OpFailedStorageNotFound = 406;
/*
* 600 series - Unsolicited broadcasts.
@@ -1290,21 +1291,22 @@ class MountService extends IMountService.Stub
waitForReady();
warnOnNotMounted();
ArrayList<String> rsp = mConnector.doCommand("asec path " + id);
for (String line : rsp) {
String []tok = line.split(" ");
try {
ArrayList<String> rsp = mConnector.doCommand(String.format("asec path %s", id));
String []tok = rsp.get(0).split(" ");
int code = Integer.parseInt(tok[0]);
if (code == VoldResponseCode.AsecPathResult) {
return tok[1];
if (code != VoldResponseCode.AsecPathResult) {
throw new IllegalStateException(String.format("Unexpected response code %d", code));
}
return tok[1];
} catch (NativeDaemonConnectorException e) {
int code = e.getCode();
if (code == VoldResponseCode.OpFailedStorageNotFound) {
throw new IllegalArgumentException(String.format("Container '%s' not found", id));
} else {
Log.e(TAG, String.format("Unexpected response code %d", code));
return "";
throw new IllegalStateException(String.format("Unexpected response code %d", code));
}
}
Log.e(TAG, "Got an empty response");
return "";
}
public void finishMediaUpdate() {

11
tests/AndroidTests/src/com/android/unit_tests/AsecTests.java
View File

@@ -259,6 +259,17 @@ public class AsecTests extends AndroidTestCase {
}
}
public void testNonExistPath() {
IMountService ms = getMs();
try {
String path = ms.getSecureContainerPath("jparks.broke.it");
failStr(path);
} catch (IllegalArgumentException e) {
} catch (Exception e) {
failStr(e);
}
}
public void testUnmountBusyContainer() {
IMountService ms = getMs();
try {