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

Commit 607b54a7 authored by Steve Kondik's avatar Steve Kondik
Browse files

mountservice: Don't nuke all volumes when decrypting 

 * Instead, just unmount the emulated internal volume since
   it's the only one which can prevent cryptfs from restarting.

Change-Id: I757babaf763b4ef789b165d116da0708a3530e99
parent decf60b4

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

+6 −1
Original line number Diff line number Diff line
@@ -2392,8 +2392,13 @@ class MountService extends IMountService.Stub 
                // to let the UI to clear itself

                mHandler.postDelayed(new Runnable() {

                    public void run() {

                        // unmount the internal emulated volume first

                        try {

                            mConnector.execute("volume", "unmount", "emulated");

                        } catch (NativeDaemonConnectorException e) {

                            Slog.e(TAG, "unable to shut down internal volume", e);

                        }

                        try {

                            mConnector.execute("volume", "shutdown");

                            mCryptConnector.execute("cryptfs", "restart");

                        } catch (NativeDaemonConnectorException e) {

                            Slog.e(TAG, "problem executing in background", e);