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

* commit 'b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61': Only offer migration between private volumes.
2015-08-14 18:29:15 +00:00
parent 36e2d32dab b4158f0e15
commit 82fee7bd0a
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