diff options
| author | Tony Mantler <nicoya@google.com> | 2015-09-21 13:26:57 -0700 |
|---|---|---|
| committer | Tony Mantler <nicoya@google.com> | 2015-10-08 16:12:44 +0000 |
| commit | cba60bd0dc6744177529f6ce67a00e25f9ef5081 (patch) | |
| tree | bb2721765a3b701ee1d198e63552e9f7169f0b29 /Settings | |
| parent | 5d9ea97428cb6581beaff99c398bec544938a591 (diff) | |
| download | android_packages_apps_TvSettings-cba60bd0dc6744177529f6ce67a00e25f9ef5081.tar.gz android_packages_apps_TvSettings-cba60bd0dc6744177529f6ce67a00e25f9ef5081.tar.bz2 android_packages_apps_TvSettings-cba60bd0dc6744177529f6ce67a00e25f9ef5081.zip | |
Fix NPE in storage migration settings
b/24206772
Change-Id: I28ccbd61429c072d599a34ee5789f2608b244840
(cherry picked from commit 57166a3b9bce4b765d34272c2b4cd311d2a45211)
Diffstat (limited to 'Settings')
| -rw-r--r-- | Settings/src/com/android/tv/settings/device/StorageResetActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Settings/src/com/android/tv/settings/device/StorageResetActivity.java b/Settings/src/com/android/tv/settings/device/StorageResetActivity.java index 3e88b361..4e7cd78b 100644 --- a/Settings/src/com/android/tv/settings/device/StorageResetActivity.java +++ b/Settings/src/com/android/tv/settings/device/StorageResetActivity.java @@ -453,7 +453,9 @@ public class StorageResetActivity extends SettingsLayoutActivity boolean showMigrate = false; final VolumeInfo currentExternal = getPackageManager().getPrimaryStorageCurrentVolume(); - if (!TextUtils.equals(currentExternal.getId(), volumeId)) { + // currentExternal will be null if the drive is not mounted. Don't offer the option to + // migrate if so. + if (currentExternal != null && !TextUtils.equals(currentExternal.getId(), volumeId)) { final List<VolumeInfo> candidates = getPackageManager().getPrimaryStorageCandidateVolumes(); for (final VolumeInfo candidate : candidates) { |