PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61':
  Only offer migration between private volumes.
This commit is contained in:
Jeff Sharkey
2015-08-14 18:29:15 +00:00
committed by Android Git Automerger
parent 36e2d32dab b4158f0e15
commit 82fee7bd0a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
View File

@@ -354,7 +354,9 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
// Only offer to migrate when not current storage // Only offer to migrate when not current storage
final VolumeInfo privateVol = getActivity().getPackageManager() final VolumeInfo privateVol = getActivity().getPackageManager()
.getPrimaryStorageCurrentVolume(); .getPrimaryStorageCurrentVolume();
migrate.setVisible(!Objects.equals(mVolume, privateVol)); migrate.setVisible((privateVol != null)
&& (privateVol.getType() == VolumeInfo.TYPE_PRIVATE)
&& !Objects.equals(mVolume, privateVol));
} }
@Override @Override