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

Commit 8cac67b6 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Need to clear identity when rebooting for FBE." into nyc-dev

parents 753c347e 1176e51b
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -1945,11 +1945,16 @@ class MountService extends IMountService.Stub
                        "Emulation not available on device with native FBE");
            }

            final long token = Binder.clearCallingIdentity();
            try {
                final boolean emulateFbe = (flags & StorageManager.DEBUG_EMULATE_FBE) != 0;
                SystemProperties.set(StorageManager.PROP_EMULATE_FBE, Boolean.toString(emulateFbe));

                // Perform hard reboot to kick policy into place
                mContext.getSystemService(PowerManager.class).reboot(null);
            } finally {
                Binder.restoreCallingIdentity(token);
            }
        }

        if ((mask & StorageManager.DEBUG_FORCE_ADOPTABLE) != 0) {