Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e42cbdb authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Gracefully finish when missing volume." into mnc-dev

parents 94f4cb4e e79ff145

src/com/android/settings/deviceinfo/PrivateVolumeSettings.java

+6 −1
Original line number Diff line number Diff line
@@ -127,7 +127,12 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { 
        mVolumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);

        mVolume = mStorageManager.findVolumeById(mVolumeId);



        Preconditions.checkNotNull(mVolume);

        if (mVolume == null) {

            Log.d(TAG, "Leaving details fragment due to missing volume");

            finish();

            return;

        }



        Preconditions.checkState(mVolume.getType() == VolumeInfo.TYPE_PRIVATE);



        addPreferencesFromResource(R.xml.device_info_storage_volume);

src/com/android/settings/deviceinfo/PublicVolumeSettings.java

+6 −1
Original line number Diff line number Diff line
@@ -90,7 +90,12 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment { 
            mVolume = mStorageManager.findVolumeById(volId);

        }



        Preconditions.checkNotNull(mVolume);

        if (mVolume == null) {

            Log.d(TAG, "Leaving details fragment due to missing volume");

            finish();

            return;

        }



        Preconditions.checkState(mVolume.getType() == VolumeInfo.TYPE_PUBLIC);



        mDisk = mStorageManager.findDiskById(mVolume.getDiskId());