diff options
author | Justin Klaassen <justinklaassen@google.com> | 2018-04-15 00:41:15 -0400 |
---|---|---|
committer | Justin Klaassen <justinklaassen@google.com> | 2018-04-15 00:41:15 -0400 |
commit | b8042fc9b036db0a6692ca853428fc6ab1e60892 (patch) | |
tree | 82669ea5d75238758e22d379a42baeada526219e /android/os/storage/DiskInfo.java | |
parent | 4d01eeaffaa720e4458a118baa137a11614f00f7 (diff) | |
download | android-28-androidx-preference-release.tar.gz |
Import Android SDK Platform P [4719250]HEADmastermainandroidx-work-releaseandroidx-webkit-releaseandroidx-viewpager2-releaseandroidx-versionedparcelable-releaseandroidx-vectordrawable-releaseandroidx-transition-releaseandroidx-sqlite-releaseandroidx-sharetarget-releaseandroidx-security-security-crypto-releaseandroidx-savedstate-releaseandroidx-room-releaseandroidx-recyclerview-releaseandroidx-recyclerview-recyclerview-selection-releaseandroidx-preference-releaseandroidx-paging-releaseandroidx-paging-legacy-releaseandroidx-navigation-releaseandroidx-mediarouter-releaseandroidx-media2-releaseandroidx-media2-media2-widget-releaseandroidx-media-releaseandroidx-master-releaseandroidx-localbroadcastmanager-releaseandroidx-loader-releaseandroidx-lifecycle-releaseandroidx-jetifier-releaseandroidx-g3-releaseandroidx-fragment-releaseandroidx-exifinterface-releaseandroidx-enterprise-releaseandroidx-core-releaseandroidx-core-core-role-releaseandroidx-coordinatorlayout-releaseandroidx-concurrent-releaseandroidx-compose-releaseandroidx-collection-releaseandroidx-camerax-releaseandroidx-browser-releaseandroidx-biometric-releaseandroidx-benchmark-releaseandroidx-autofill-releaseandroidx-arch-core-releaseandroidx-appcompat-releaseandroidx-annotation-releaseandroidx-annotation-annotation-experimental-releaseandroidx-activity-releaseandroid-arch-work-releaseandroid-arch-navigation-release
/google/data/ro/projects/android/fetch_artifact \
--bid 4719250 \
--target sdk_phone_armv7-win_sdk \
sdk-repo-linux-sources-4719250.zip
AndroidVersion.ApiLevel has been modified to appear as 28
Change-Id: I9ec0a12c9251b8449dba0d86b0cfdbcca16b0a7c
Diffstat (limited to 'android/os/storage/DiskInfo.java')
-rw-r--r-- | android/os/storage/DiskInfo.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/android/os/storage/DiskInfo.java b/android/os/storage/DiskInfo.java index 91141074..d493cceb 100644 --- a/android/os/storage/DiskInfo.java +++ b/android/os/storage/DiskInfo.java @@ -17,6 +17,7 @@ package android.os.storage; import android.annotation.NonNull; +import android.annotation.Nullable; import android.content.res.Resources; import android.os.Parcel; import android.os.Parcelable; @@ -93,7 +94,7 @@ public class DiskInfo implements Parcelable { return true; } - public String getDescription() { + public @Nullable String getDescription() { final Resources res = Resources.getSystem(); if ((flags & FLAG_SD) != 0) { if (isInteresting(label)) { @@ -112,6 +113,17 @@ public class DiskInfo implements Parcelable { } } + public @Nullable String getShortDescription() { + final Resources res = Resources.getSystem(); + if (isSd()) { + return res.getString(com.android.internal.R.string.storage_sd_card); + } else if (isUsb()) { + return res.getString(com.android.internal.R.string.storage_usb_drive); + } else { + return null; + } + } + public boolean isAdoptable() { return (flags & FLAG_ADOPTABLE) != 0; } |