Merge "Only offer migration between private volumes." into mnc-dev

2015-08-14 18:23:39 +00:00
parent 7e36d33c00 6f52ed3332
commit b4158f0e15
1 changed files with 3 additions and 1 deletions
--- 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