From a1fb47beb8d835358ed7956581de044b727d6079 Mon Sep 17 00:00:00 2001
From: Arc Wang <arcwang@google.com>
Date: Wed, 31 Mar 2021 10:05:09 +0800
Subject: [PATCH] Fix com.android.settings.deviceinfo.storage.StorageEntryTest

StorageEntry#isStub() is unused and not built in apk.
Remove the method to fix test fail.

Bug: 184045592
Test: atest com.android.settings.deviceinfo.storage
Change-Id: I89d73c45111918c2ff01174d6fbb47f8c59f6968
---
 .../settings/deviceinfo/storage/StorageEntry.java        | 8 --------
 .../storage/StorageItemPreferenceController.java         | 2 ++
 .../settings/deviceinfo/storage/StorageEntryTest.java    | 9 ---------
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/com/android/settings/deviceinfo/storage/StorageEntry.java b/src/com/android/settings/deviceinfo/storage/StorageEntry.java
index 9ea0292d195..f71811602d5 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageEntry.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageEntry.java
@@ -236,14 +236,6 @@ public class StorageEntry implements Comparable<StorageEntry>, Parcelable {
         return mVolumeInfo == null ? false : mVolumeInfo.getType() == VolumeInfo.TYPE_PUBLIC;
     }
 
-    /**
-     * Stub volume is a volume that is maintained by external party such as the ChromeOS processes
-     * in ARC++.
-     */
-    public boolean isStub() {
-        return mVolumeInfo == null ? false : mVolumeInfo.getType() == VolumeInfo.TYPE_STUB;
-    }
-
     /** Returns description. */
     public String getDescription() {
         if (isVolumeInfo()) {
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index e5259f996e3..052fc98074c 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -230,6 +230,8 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
     }
 
     private boolean isValidPublicVolume() {
+        // Stub volume is a volume that is maintained by external party such as the ChromeOS
+        // processes in ARC++.
         return mVolume != null
                 && (mVolume.getType() == VolumeInfo.TYPE_PUBLIC
                 || mVolume.getType() == VolumeInfo.TYPE_STUB)
diff --git a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageEntryTest.java b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageEntryTest.java
index 3cd35395e01..c2591a778da 100644
--- a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageEntryTest.java
+++ b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageEntryTest.java
@@ -217,15 +217,6 @@ public class StorageEntryTest {
         assertThat(publicStorage.isPublic()).isTrue();
     }
 
-    @Test
-    public void isStub_stubVolume_shouldReturnTrue() {
-        final VolumeInfo stubVolumeInfo = mock(VolumeInfo.class);
-        final StorageEntry stubStorage = new StorageEntry(mContext, stubVolumeInfo);
-        when(stubVolumeInfo.getType()).thenReturn(VolumeInfo.TYPE_STUB);
-
-        assertThat(stubStorage.isStub()).isTrue();
-    }
-
     @Test
     public void isPrivate_nonVolumeInfo_shouldReturnFalse() {
         final DiskInfo diskInfo = mock(DiskInfo.class);