Revert "Reboot only userspace to kick FUSE flag change into place"
This reverts commit 41cd8dec1235763ca5a2a6ba40f8dd567a77169d.
Reason for revert: b/148423904
IN ADDITION this change adds FuseDaemonHostTest to presubmit only when
StorageManagerService.java has been modified. This should help catch
similar problems in the future.
Change-Id: Ib6864c6686bef801eddbfa7b129431c5f1372b21
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 4b4ce34..32830ae 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -1701,15 +1701,8 @@
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 0b723c9..059eb6a 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"]
}
]
}