From 07dcbbc8d4a2aa5c88741f78a5b616d7f70fd749 Mon Sep 17 00:00:00 2001 From: Shafik Nassar Date: Tue, 28 Jan 2020 18:35:25 +0000 Subject: [PATCH] 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 --- .../com/android/server/StorageManagerService.java | 11 ++--------- services/core/java/com/android/server/TEST_MAPPING | 4 ++++ 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 4b4ce348385a6..32830aeacf06d 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 0b723c997a83d..059eb6ad724c7 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"] } ] }