Merge "Handle ISE when physical volume isn't mounted." into jb-mr1-dev (71520a68) · Commits · e / os / android_frameworks_base

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

+10 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1577,11 +1577,18 @@ class MountService extends IMountService.Stub

	private void warnOnNotMounted() {		private void warnOnNotMounted() {
	final StorageVolume primary = getPrimaryPhysicalVolume();		final StorageVolume primary = getPrimaryPhysicalVolume();
	if (primary != null		if (primary != null) {
	&& Environment.MEDIA_MOUNTED.equals(getVolumeState(primary.getPath()))) {		boolean mounted = false;
			try {
			mounted = Environment.MEDIA_MOUNTED.equals(getVolumeState(primary.getPath()));
			} catch (IllegalStateException e) {
			}

			if (!mounted) {
	Slog.w(TAG, "getSecureContainerList() called when storage not mounted");		Slog.w(TAG, "getSecureContainerList() called when storage not mounted");
	}		}
	}		}
			}

	public String[] getSecureContainerList() {		public String[] getSecureContainerList() {
	validatePermission(android.Manifest.permission.ASEC_ACCESS);		validatePermission(android.Manifest.permission.ASEC_ACCESS);