diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java index af1baa1d150..e8fbb8c3325 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