Merge "Revert "Reboot only userspace to kick FUSE flag change into place""

2 files changed, 6 insertions, 9 deletions

diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 4b4ce348385a..32830aeacf06 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -1701,15 +1701,8 @@ class StorageManagerService extends IStorageManager.Stub
         if (mIsFuseEnabled != settingsFuseFlag) {
             Slog.i(TAG, "Toggling persist.sys.fuse to " + settingsFuseFlag);
             SystemProperties.set(PROP_FUSE, Boolean.toString(settingsFuseFlag));
-
-            PowerManager powerManager = mContext.getSystemService(PowerManager.class);
-            if (powerManager.isRebootingUserspaceSupported()) {
-                // Perform userspace reboot to kick policy into place
-                powerManager.reboot(PowerManager.REBOOT_USERSPACE);
-            } else {
-                // Perform hard reboot to kick policy into place
-                powerManager.reboot("fuse_prop");
-            }
+            // Perform hard reboot to kick policy into place
+            mContext.getSystemService(PowerManager.class).reboot("fuse_prop");
         }
     }
 
diff --git a/services/core/java/com/android/server/TEST_MAPPING b/services/core/java/com/android/server/TEST_MAPPING
index 0b723c997a83..059eb6ad724c 100644
--- a/services/core/java/com/android/server/TEST_MAPPING
+++ b/services/core/java/com/android/server/TEST_MAPPING
@@ -36,6 +36,10 @@
                 }
             ],
             "file_patterns": ["NotificationManagerService\\.java"]
+        },
+        {
+            "name": "FuseDaemonHostTest",
+            "file_patterns": ["StorageManagerService\\.java"]
         }
     ]
 }