diff options
| author | Tom Marshall <tdm@cyngn.com> | 2015-11-24 15:30:20 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-11-25 05:31:56 -0800 |
| commit | 0079f521ff38f74ad8555ffb310900b6c7988990 (patch) | |
| tree | e7c0b58cdcb964581f7768093e5fbe6988b7dfc5 | |
| parent | 4a806aef49b33f8c823983b9fac120f9b9b837d9 (diff) | |
| download | packages_apps_Settings-0079f521ff38f74ad8555ffb310900b6c7988990.zip packages_apps_Settings-0079f521ff38f74ad8555ffb310900b6c7988990.tar.gz packages_apps_Settings-0079f521ff38f74ad8555ffb310900b6c7988990.tar.bz2 | |
storage: Do not allow eject for volumes on non-removable disks
Change-Id: Ib10747f27ef46ebdca906a904271f7c1e9bc3e73
| -rw-r--r-- | src/com/android/settings/deviceinfo/PublicVolumeSettings.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/deviceinfo/StorageVolumePreference.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java index c9b4beb..7708cf0 100644 --- a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java @@ -152,7 +152,7 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment { if (mVolume.getState() == VolumeInfo.STATE_UNMOUNTED) { addPreference(mMount); } - if (mVolume.isMountedReadable()) { + if (!mDisk.isNonRemovable() && mVolume.isMountedReadable()) { addPreference(mUnmount); } addPreference(mFormatPublic); diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java index 3511b91..e59f3f6 100644 --- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java +++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java @@ -91,6 +91,7 @@ public class StorageVolumePreference extends Preference { setIcon(icon); if (volume.getType() == VolumeInfo.TYPE_PUBLIC + && !volume.disk.isNonRemovable() && volume.isMountedReadable()) { setWidgetLayoutResource(R.layout.preference_storage_action); } |