commit 241238c6df203b1fde91a92d83fb420eda2ba10d
author Arc Wang <arcwang@google.com> Thu May 12 03:39:58 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 12 03:39:58 2022 +0000
tree a6a045ca2a2eee7e0e8322455f1c451d7fa079ae
parent bd31deb47695c5c7bcb7d3881fa648820b474c43
parent 87212cf504da083e76ecca6a2d6eef3037efd3c2

Merge "Storage Settings crash" into tm-dev

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

diff --git a/src/com/android/settings/deviceinfo/VolumeOptionMenuController.java b/src/com/android/settings/deviceinfo/VolumeOptionMenuController.java
index d4f93fa..42a3a16 100644
--- a/src/com/android/settings/deviceinfo/VolumeOptionMenuController.java
+++ b/src/com/android/settings/deviceinfo/VolumeOptionMenuController.java
@@ -132,7 +132,6 @@
         if (mStorageEntry.isPrivate()) {
             if (!mStorageEntry.isDefaultInternalStorage()) {
                 mRename.setVisible(true);
-                mUnmount.setVisible(true);
                 mFormatAsPortable.setVisible(true);
             }
 

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

diff --git a/tests/unit/src/com/android/settings/deviceinfo/VolumeOptionMenuControllerTest.java b/tests/unit/src/com/android/settings/deviceinfo/VolumeOptionMenuControllerTest.java
index 314f8c2..8bd9b01 100644
--- a/tests/unit/src/com/android/settings/deviceinfo/VolumeOptionMenuControllerTest.java
+++ b/tests/unit/src/com/android/settings/deviceinfo/VolumeOptionMenuControllerTest.java
@@ -142,7 +142,6 @@
         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);