diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2015-08-14 18:29:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-14 18:29:15 +0000 |
| commit | 82fee7bd0a82a48e204bcaf5480701b36c857276 (patch) | |
| tree | 2ed0cf0fae8e900f528d3e8a4d7096e7be81c531 /src/com/android/settings/deviceinfo | |
| parent | 36e2d32dab47f9d46c0234202c2a799c43b67c9e (diff) | |
| parent | b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61 (diff) | |
| download | packages_apps_Settings-82fee7bd0a82a48e204bcaf5480701b36c857276.zip packages_apps_Settings-82fee7bd0a82a48e204bcaf5480701b36c857276.tar.gz packages_apps_Settings-82fee7bd0a82a48e204bcaf5480701b36c857276.tar.bz2 | |
am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
* commit 'b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61':
Only offer migration between private volumes.
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 |