commit 996c23dc60c65943febe21bb7e72607d096bf271
author Daniel Chapin <chapin@google.com> Thu May 30 19:40:47 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu May 30 20:02:41 2019 +0000
tree cf0e8e2650e7eff1f6097845829633fb1ec3c9a0
parent 4b44886aa462b328d655d41cde02728c1eeee459

Revert "Fix AppFuseMountScope.close()"

This reverts commit be9c9900198891e97c228d244c3df064560c4756.

Reason for revert: b/134032662

Change-Id: I7132ba078d44ba424bc8a9bf6874f8077738b22d
(cherry picked from commit e890b9793b4f0d7d139a5e78a5c46735b2cf04c2)

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

diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index d2b992b..2f2b40a 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -2842,9 +2842,8 @@
         }
     }
 
-    /** 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 @@
         @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 @@
 
         @Override
         public void close() throws Exception {
-            if (mMounted) {
+            if (opened) {
                 mVold.unmountAppFuse(uid, mountId);
-                mMounted = false;
+                opened = false;
             }
         }
     }