Avoid crash in system server when mounting container (a20c8ef4) · Commits · e / os / android_frameworks_base

core/tests/coretests/src/android/content/pm/PackageHelperTests.java

0 → 100644

+131 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2011 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.content.pm;

		import com.android.internal.content.PackageHelper;

		import android.os.IBinder;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.storage.IMountService;
		import android.test.AndroidTestCase;
		import android.util.Log;

		public class PackageHelperTests extends AndroidTestCase {
		private static final boolean localLOGV = true;
		public static final String TAG = "PackageHelperTests";
		protected final String PREFIX = "android.content.pm";
		private IMountService mMs;
		private String fullId;
		private String fullId2;

		private IMountService getMs() {
		IBinder service = ServiceManager.getService("mount");
		if (service != null) {
		return IMountService.Stub.asInterface(service);
		} else {
		Log.e(TAG, "Can't get mount service");
		}
		return null;
		}

		private void cleanupContainers() throws RemoteException {
		Log.d(TAG,"cleanUp");
		IMountService ms = getMs();
		String[] containers = ms.getSecureContainerList();
		for (int i = 0; i < containers.length; i++) {
		if (containers[i].startsWith(PREFIX)) {
		Log.d(TAG,"cleaing up "+containers[i]);
		ms.destroySecureContainer(containers[i], true);
		}
		}
		}

		void failStr(String errMsg) {
		Log.w(TAG, "errMsg=" + errMsg);
		fail(errMsg);
		}

		void failStr(Exception e) {
		failStr(e.getMessage());
		}

		@Override
		protected void setUp() throws Exception {
		super.setUp();
		if (localLOGV) Log.i(TAG, "Cleaning out old test containers");
		cleanupContainers();
		}

		@Override
		protected void tearDown() throws Exception {
		super.tearDown();
		if (localLOGV) Log.i(TAG, "Cleaning out old test containers");
		cleanupContainers();
		}

		public void testMountAndPullSdCard() {
		try {
		fullId = PREFIX;
		fullId2 = PackageHelper.createSdDir(1024, fullId, "none", android.os.Process.myUid());

		Log.d(TAG,PackageHelper.getSdDir(fullId));
		PackageHelper.unMountSdDir(fullId);

		Runnable r1 = getMountRunnable();
		Runnable r2 = getDestroyRunnable();
		Thread thread = new Thread(r1);
		Thread thread2 = new Thread(r2);
		thread2.start();
		thread.start();
		} catch (Exception e) {
		failStr(e);
		}
		}

		public Runnable getMountRunnable() {
		Runnable r = new Runnable () {
		public void run () {
		try {
		Thread.sleep(5);
		String path = PackageHelper.mountSdDir(fullId, "none",
		android.os.Process.myUid());
		Log.e(TAG, "mount done " + path);
		} catch (IllegalArgumentException iae) {
		throw iae;
		} catch (Throwable t) {
		Log.e(TAG, "mount failed", t);
		}
		}
		};
		return r;
		}

		public Runnable getDestroyRunnable() {
		Runnable r = new Runnable () {
		public void run () {
		try {
		PackageHelper.destroySdDir(fullId);
		Log.e(TAG, "destroy done: " + fullId);
		} catch (Throwable t) {
		Log.e(TAG, "destroy failed", t);
		}
		}
		};
		return r;
		}
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1509,7 +1509,8 @@ class MountService extends IMountService.Stub
		} catch (NativeDaemonConnectorException e) {
		int code = e.getCode();
		if (code == VoldResponseCode.OpFailedStorageNotFound) {
		throw new IllegalArgumentException(String.format("Container '%s' not found", id));
		Slog.i(TAG, String.format("Container '%s' not found", id));
		return null;
		} else {
		throw new IllegalStateException(String.format("Unexpected response code %d", code));
		}