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 am: aed1bba60a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14029456

Change-Id: I3a382089a60bc5c036d7e5d2fee85ddff03de68f
This commit is contained in:
Arc Wang
2021-03-31 12:53:38 +00:00
committed by Automerger Merge Worker
parent 90119bca81 aed1bba60a
commit 9d5b4688e2
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;
}
/**
* 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()) {

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

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