Merge "Fix com.android.settings.deviceinfo.storage.StorageEntryTest" into sc-dev

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()) {

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)

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