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

Merge "Fix AppFuseMountScope.close()" into qt-dev

Browse Source
This commit is contained in:
Anton Hansson
2019-05-29 15:25:18 +00:00
committed by Android (Google) Code Review
parent 190e99cf3a be9c990019
commit ab09bd96ac
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -2842,8 +2842,9 @@ class StorageManagerService extends IStorageManager.Stub
} }
} }
/** Not thread safe */
class AppFuseMountScope extends AppFuseBridge.MountScope { class AppFuseMountScope extends AppFuseBridge.MountScope {
boolean opened = false; private boolean mMounted = false;
public AppFuseMountScope(int uid, int mountId) { public AppFuseMountScope(int uid, int mountId) {
super(uid, mountId); super(uid, mountId);
@@ -2852,8 +2853,9 @@ class StorageManagerService extends IStorageManager.Stub
@Override @Override
public ParcelFileDescriptor open() throws NativeDaemonConnectorException { public ParcelFileDescriptor open() throws NativeDaemonConnectorException {
try { try {
return new ParcelFileDescriptor( final FileDescriptor fd = mVold.mountAppFuse(uid, mountId);
mVold.mountAppFuse(uid, mountId)); mMounted = true;
return new ParcelFileDescriptor(fd);
} catch (Exception e) { } catch (Exception e) {
throw new NativeDaemonConnectorException("Failed to mount", e); throw new NativeDaemonConnectorException("Failed to mount", e);
} }
@@ -2872,9 +2874,9 @@ class StorageManagerService extends IStorageManager.Stub
@Override @Override
public void close() throws Exception { public void close() throws Exception {
if (opened) { if (mMounted) {
mVold.unmountAppFuse(uid, mountId); mVold.unmountAppFuse(uid, mountId);
opened = false; mMounted = false;
} }
} }
} }