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

Commit 241238c6 authored by Arc Wang's avatar Arc Wang Committed by Android (Google) Code Review
Browse files

Merge "Storage Settings crash" into tm-dev

parents bd31deb4 87212cf5

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

+0 −1
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ public class VolumeOptionMenuController implements LifecycleObserver, OnCreateOp 
        if (mStorageEntry.isPrivate()) {

            if (!mStorageEntry.isDefaultInternalStorage()) {

                mRename.setVisible(true);

                mUnmount.setVisible(true);

                mFormatAsPortable.setVisible(true);

            }

tests/unit/src/com/android/settings/deviceinfo/VolumeOptionMenuControllerTest.java

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ public class VolumeOptionMenuControllerTest { 
        mController.onPrepareOptionsMenu(mMenu);



        verify(mController.mRename, atLeastOnce()).setVisible(true);

        verify(mController.mUnmount, atLeastOnce()).setVisible(true);

        verify(mController.mFormatAsPortable, atLeastOnce()).setVisible(true);

        verify(mController.mMount, never()).setVisible(true);

        verify(mController.mFormat, never()).setVisible(true);