PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Increase volume search timeout, fix dialog flow.

Browse Source 
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
This commit is contained in:
Jeff Sharkey
2018-04-20 14:34:29 -06:00
parent 3bdd65e255
commit b9a1ebcb45
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
View File

@@ -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

2
src/com/android/settings/deviceinfo/StorageWizardInit.java
View File

@@ -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