diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-08-14 09:46:03 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2015-08-14 09:46:03 -0700 |
| commit | 6f52ed3332e1e8f13eeb5e95c7439ee5737343bd (patch) | |
| tree | d00925459c5ff7da069738ef0c6658acaaaa9a2e /src/com/android/settings/deviceinfo | |
| parent | 0814827e8fac983e82169c13b7136156f484e44b (diff) | |
| download | packages_apps_Settings-6f52ed3332e1e8f13eeb5e95c7439ee5737343bd.zip packages_apps_Settings-6f52ed3332e1e8f13eeb5e95c7439ee5737343bd.tar.gz packages_apps_Settings-6f52ed3332e1e8f13eeb5e95c7439ee5737343bd.tar.bz2 | |
Only offer migration between private volumes.
Without this change, there is a confusing option to migrate a public
SD card volume to internal storage, which will always fail if the
user picks it, since it's not supported under the hood.
Bug: 22966671
Change-Id: Id7cad07eea6583aace398a6d64383bf7d884ae9e
Diffstat (limited to 'src/com/android/settings/deviceinfo')
| -rw-r--r-- | src/com/android/settings/deviceinfo/PrivateVolumeSettings.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java index 4f9b33b..779026b 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java @@ -354,7 +354,9 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { // Only offer to migrate when not current storage final VolumeInfo privateVol = getActivity().getPackageManager() .getPrimaryStorageCurrentVolume(); - migrate.setVisible(!Objects.equals(mVolume, privateVol)); + migrate.setVisible((privateVol != null) + && (privateVol.getType() == VolumeInfo.TYPE_PRIVATE) + && !Objects.equals(mVolume, privateVol)); } @Override |