Merge "Asec: Add new 'StorageNotFound' response code handling for container paths" (a89e372d) · Commits · e / os / android_frameworks_base

services/java/com/android/server/MountService.java

+13 −11

Original line number	Diff line number	Diff line
		@@ -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) {
		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 −0

Original line number	Diff line number	Diff line
		@@ -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 {