commit b0f9e9d49fb9cf0c4ffada36dc129b7899f16ffb
author Jeff Sharkey <jsharkey@google.com> Fri Aug 14 18:34:36 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 14 18:34:36 2015 +0000
tree 475b48313970e5d34b8487e5e75f16adf3b0575a
parent 7c8cb46fe383956830a04e079a13ded56f7c2154
parent 82fee7bd0a82a48e204bcaf5480701b36c857276

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

* commit '82fee7bd0a82a48e204bcaf5480701b36c857276':
  Only offer migration between private volumes.

src/com/android/settings/deviceinfo/PrivateVolumeSettings.java

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