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

Merge "Storage Settings crash" into tm-dev

Browse Source
This commit is contained in:
Arc Wang
2022-05-12 03:39:58 +00:00
committed by Android (Google) Code Review
parent bd31deb476 87212cf504
commit 241238c6df
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/deviceinfo/VolumeOptionMenuController.java
View File

@@ -132,7 +132,6 @@ public class VolumeOptionMenuController implements LifecycleObserver, OnCreateOp
if (mStorageEntry.isPrivate()) { if (mStorageEntry.isPrivate()) {
if (!mStorageEntry.isDefaultInternalStorage()) { if (!mStorageEntry.isDefaultInternalStorage()) {
mRename.setVisible(true); mRename.setVisible(true);
mUnmount.setVisible(true);
mFormatAsPortable.setVisible(true); mFormatAsPortable.setVisible(true);
} }

1
tests/unit/src/com/android/settings/deviceinfo/VolumeOptionMenuControllerTest.java
View File

@@ -142,7 +142,6 @@ public class VolumeOptionMenuControllerTest {
mController.onPrepareOptionsMenu(mMenu); mController.onPrepareOptionsMenu(mMenu);
verify(mController.mRename, atLeastOnce()).setVisible(true); verify(mController.mRename, atLeastOnce()).setVisible(true);
verify(mController.mUnmount, atLeastOnce()).setVisible(true);
verify(mController.mFormatAsPortable, atLeastOnce()).setVisible(true); verify(mController.mFormatAsPortable, atLeastOnce()).setVisible(true);
verify(mController.mMount, never()).setVisible(true); verify(mController.mMount, never()).setVisible(true);
verify(mController.mFormat, never()).setVisible(true); verify(mController.mFormat, never()).setVisible(true);