Merge "Storage Settings crash" into tm-dev am: 241238c6df am: 0bfff4cabb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988

Change-Id: I2b72522a23f615d98d9a7e8a39eced04399e456f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Arc Wang
2022-05-12 04:15:19 +00:00
committed by Automerger Merge Worker
2 changed files with 0 additions and 2 deletions

View File

@@ -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);
}

View File

@@ -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);