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

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

Browse Source
This commit is contained in:
Arc Wang
2021-03-31 12:36:46 +00:00
committed by Android (Google) Code Review
parent a05759cb7d a1fb47beb8
commit aed1bba60a
3 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/deviceinfo/storage/StorageEntry.java
View File

@@ -236,14 +236,6 @@ public class StorageEntry implements Comparable<StorageEntry>, Parcelable {
return mVolumeInfo == null ? false : mVolumeInfo.getType() == VolumeInfo.TYPE_PUBLIC; 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. */ /** Returns description. */
public String getDescription() { public String getDescription() {
if (isVolumeInfo()) { if (isVolumeInfo()) {

2
src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
View File

@@ -230,6 +230,8 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
} }
private boolean isValidPublicVolume() { private boolean isValidPublicVolume() {
// Stub volume is a volume that is maintained by external party such as the ChromeOS
// processes in ARC++.
return mVolume != null return mVolume != null
&& (mVolume.getType() == VolumeInfo.TYPE_PUBLIC && (mVolume.getType() == VolumeInfo.TYPE_PUBLIC
|| mVolume.getType() == VolumeInfo.TYPE_STUB) || mVolume.getType() == VolumeInfo.TYPE_STUB)

9
tests/unit/src/com/android/settings/deviceinfo/storage/StorageEntryTest.java
View File

@@ -217,15 +217,6 @@ public class StorageEntryTest {
assertThat(publicStorage.isPublic()).isTrue(); 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 @Test
public void isPrivate_nonVolumeInfo_shouldReturnFalse() { public void isPrivate_nonVolumeInfo_shouldReturnFalse() {
final DiskInfo diskInfo = mock(DiskInfo.class); final DiskInfo diskInfo = mock(DiskInfo.class);