Merge "Storage Settings crash" into tm-dev am: 241238c6df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988 Change-Id: Ib04a11d79b65cbbec0b005079aa45dc18186b37d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user