diff options
author | Jeff Sharkey <jsharkey@android.com> | 2015-07-08 21:55:17 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-08 21:55:44 +0000 |
commit | 80eba76b109efa7e48eaf7aac145e05938d4405e (patch) | |
tree | 64f7725fb573db1f8dffaa35e7778afd99646b67 /src/com/android/settings/deviceinfo | |
parent | 01ce80b574e2404d911750c16a1ddd89c787f3ff (diff) | |
parent | 697ff544bffba2854a8400fee1314f93caa667e5 (diff) | |
download | packages_apps_Settings-80eba76b109efa7e48eaf7aac145e05938d4405e.zip packages_apps_Settings-80eba76b109efa7e48eaf7aac145e05938d4405e.tar.gz packages_apps_Settings-80eba76b109efa7e48eaf7aac145e05938d4405e.tar.bz2 |
Merge "Move storage when formatting primary disk." into mnc-dev
Diffstat (limited to 'src/com/android/settings/deviceinfo')
-rw-r--r-- | src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java index 8a03f83..a18bca3 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java +++ b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java @@ -24,8 +24,10 @@ import android.app.DialogFragment; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.content.pm.IPackageMoveObserver; import android.os.AsyncTask; import android.os.Bundle; +import android.os.RemoteException; import android.os.storage.DiskInfo; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; @@ -36,6 +38,8 @@ import android.widget.Toast; import com.android.settings.R; +import java.util.Objects; + public class StorageWizardFormatProgress extends StorageWizardBase { private static final String TAG_SLOW_WARNING = "slow_warning"; @@ -97,7 +101,18 @@ public class StorageWizardFormatProgress extends StorageWizardBase { publishProgress(60); final VolumeInfo privateVol = activity.findFirstVolume(VolumeInfo.TYPE_PRIVATE); - mPrivateBench = storage.benchmark(privateVol.id); + mPrivateBench = storage.benchmark(privateVol.getId()); + + // If we just adopted the device that had been providing + // physical storage, then automatically move storage to the + // new emulated volume. + if (activity.mDisk.isDefaultPrimary() + && Objects.equals(storage.getPrimaryStorageUuid(), + StorageManager.UUID_PRIMARY_PHYSICAL)) { + Log.d(TAG, "Just formatted primary physical; silently moving " + + "storage to new emulated volume"); + storage.setPrimaryStorageUuid(privateVol.getFsUuid(), new SilentObserver()); + } } else { storage.partitionPublic(activity.mDisk.getId()); @@ -213,4 +228,16 @@ public class StorageWizardFormatProgress extends StorageWizardBase { } finishAffinity(); } + + private static class SilentObserver extends IPackageMoveObserver.Stub { + @Override + public void onCreated(int moveId, Bundle extras) { + // Ignored + } + + @Override + public void onStatusChanged(int moveId, int status, long estMillis) { + // Ignored + } + } } |