Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c34a9fc authored by Shafik Nassar's avatar Shafik Nassar Committed by Android (Google) Code Review
Browse files

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

parents 3daccde5 07dcbbc8

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

+2 −9
Original line number Diff line number Diff line
@@ -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");

            }

            mContext.getSystemService(PowerManager.class).reboot("fuse_prop");

        }

    }

services/core/java/com/android/server/TEST_MAPPING

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ 
                }

            ],

            "file_patterns": ["NotificationManagerService\\.java"]

        },

        {

            "name": "FuseDaemonHostTest",

            "file_patterns": ["StorageManagerService\\.java"]

        }

    ]

}