Merge cherrypicks of [7817250, 7817416] into qt-release (b598fcff) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/StorageManagerService.java

+5 −7

Original line number	Diff line number	Diff line
		@@ -2842,9 +2842,8 @@ class StorageManagerService extends IStorageManager.Stub
		}
		}

		/** Not thread safe */
		class AppFuseMountScope extends AppFuseBridge.MountScope {
		private boolean mMounted = false;
		boolean opened = false;

		public AppFuseMountScope(int uid, int mountId) {
		super(uid, mountId);
		@@ -2853,9 +2852,8 @@ class StorageManagerService extends IStorageManager.Stub
		@Override
		public ParcelFileDescriptor open() throws NativeDaemonConnectorException {
		try {
		final FileDescriptor fd = mVold.mountAppFuse(uid, mountId);
		mMounted = true;
		return new ParcelFileDescriptor(fd);
		return new ParcelFileDescriptor(
		mVold.mountAppFuse(uid, mountId));
		} catch (Exception e) {
		throw new NativeDaemonConnectorException("Failed to mount", e);
		}
		@@ -2874,9 +2872,9 @@ class StorageManagerService extends IStorageManager.Stub

		@Override
		public void close() throws Exception {
		if (mMounted) {
		if (opened) {
		mVold.unmountAppFuse(uid, mountId);
		mMounted = false;
		opened = false;
		}
		}
		}