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

Commit 5b210dad authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Increase volume search timeout, fix dialog flow." into pi-dev am: 2e3aacaa 

am: 3595870f

Change-Id: I6d5a007bc61c4e136f75c0462df4967e1861a92d
parents 60c513d9 3595870f

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