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

Commit b9a1ebcb authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Increase volume search timeout, fix dialog flow. 

Slower devices can take longer to process kernel events, so try up
to 25 times (~6 seconds) to find the volume after the partitioning
is finished.

Fix bug where we'd finish() while trying to show the format
confirmation dialog, meaning users couldn't format corrupted
non-primary volumes.

Bug: 74129968, 77849654, 74132243
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I91144051cb6de0cd944d93b03dc5127676e24be8
parent 3bdd65e2

src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class StorageWizardFormatProgress extends StorageWizardBase { 
                    storage.partitionPrivate(activity.mDisk.getId());

                    publishProgress(40);



                    final VolumeInfo privateVol = activity.findFirstVolume(TYPE_PRIVATE, 5);

                    final VolumeInfo privateVol = activity.findFirstVolume(TYPE_PRIVATE, 25);

                    final CompletableFuture<PersistableBundle> result = new CompletableFuture<>();

                    storage.benchmark(privateVol.getId(), new IVoldTaskListener.Stub() {

                        @Override

src/com/android/settings/deviceinfo/StorageWizardInit.java

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ public class StorageWizardInit extends StorageWizardBase { 
        if (!mDisk.isAdoptable()) {

            // If not adoptable, we only have one choice

            onNavigateExternal(null);

            finish();

        } else if (!mIsPermittedToAdopt) {

            // TODO: Show a message about why this is disabled for guest and

            // that only an admin user can adopt an sd card.
@@ -77,6 +76,7 @@ public class StorageWizardInit extends StorageWizardBase { 
            final Intent intent = new Intent(this, StorageWizardReady.class);

            intent.putExtra(DiskInfo.EXTRA_DISK_ID, mDisk.getId());

            startActivity(intent);

            finish();



        } else {

            // Gotta format to get there