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

Commit 2e3aacaa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Increase volume search timeout, fix dialog flow." into pi-dev

parents f62f91b0 b9a1ebcb

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

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

                    storage.partitionPrivate(activity.mDisk.getId());

                    publishProgress(40);

                    publishProgress(40);





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

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

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

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

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

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

                        @Override

                        @Override

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

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

        if (!mDisk.isAdoptable()) {

            // If not adoptable, we only have one choice

            // If not adoptable, we only have one choice

            onNavigateExternal(null);

            onNavigateExternal(null);

            finish();

        } else if (!mIsPermittedToAdopt) {

        } else if (!mIsPermittedToAdopt) {

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

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

            // that only an admin user can adopt an sd card.

            // 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);

            final Intent intent = new Intent(this, StorageWizardReady.class);

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

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

            startActivity(intent);

            startActivity(intent);

            finish();





        } else {

        } else {

            // Gotta format to get there

            // Gotta format to get there