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

Commit f7741af0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Prevent SD-card mount failure when erase sd card completed"

parents 3df2d85a 1b355669

core/java/com/android/internal/os/storage/ExternalStorageFormatter.java

+1 −3
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ public class ExternalStorageFormatter extends Service 


    private boolean mFactoryReset = false;

    private boolean mAlwaysReset = false;

    private boolean mIsCancelled = false;

    private boolean mIsFormatSuccess = false;



    StorageEventListener mStorageListener = new StorageEventListener() {
@@ -130,7 +129,6 @@ public class ExternalStorageFormatter extends Service 
    @Override

    public void onCancel(DialogInterface dialog) {



        mIsCancelled=true;

        IMountService mountService = getMountService();

        try {

            final StorageVolume[] volumes = mountService.getVolumeList();
@@ -197,7 +195,7 @@ public class ExternalStorageFormatter extends Service 
                || Environment.MEDIA_MOUNTED_READ_ONLY.equals(status)) {

            updateProgressDialog(R.string.progress_unmounting);

            try {

                if(mIsCancelled && mIsFormatSuccess) return;

                if(mIsFormatSuccess) return;

                final IMountService mountService = getMountService();

                final StorageVolume[] volumes = mountService.getVolumeList();

                final ArrayList<StorageVolume> physicalVols = StorageManager.getPhysicalExternalVolume(volumes);