diff --git a/src/com/android/settings/deviceinfo/storage/StorageEntry.java b/src/com/android/settings/deviceinfo/storage/StorageEntry.java index f71811602d5..b419370e22b 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageEntry.java +++ b/src/com/android/settings/deviceinfo/storage/StorageEntry.java @@ -26,6 +26,8 @@ import android.os.storage.VolumeInfo; import android.os.storage.VolumeRecord; import android.text.TextUtils; +import com.android.settings.R; + import java.io.File; /** @@ -44,8 +46,15 @@ public class StorageEntry implements Comparable, Parcelable { mVolumeInfo = volumeInfo; mUnsupportedDiskInfo = null; mMissingVolumeRecord = null; - mVolumeInfoDescription = context.getSystemService(StorageManager.class) - .getBestVolumeDescription(mVolumeInfo); + + if (isDefaultInternalStorage()) { + // Shows "This device" for default internal storage. + mVolumeInfoDescription = context.getResources() + .getString(R.string.storage_default_internal_storage); + } else { + mVolumeInfoDescription = context.getSystemService(StorageManager.class) + .getBestVolumeDescription(mVolumeInfo); + } } public StorageEntry(@NonNull DiskInfo diskInfo) { 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 c2591a778da..7541e939cdd 100644 --- a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageEntryTest.java +++ b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageEntryTest.java @@ -31,6 +31,8 @@ import android.os.storage.VolumeRecord; import androidx.test.core.app.ApplicationProvider; import androidx.test.runner.AndroidJUnit4; +import com.android.settings.testutils.ResourcesUtils; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -246,6 +248,17 @@ public class StorageEntryTest { assertThat(recordStorage.getDescription()).isEqualTo(description); } + @Test + public void getDescription_defaultInternalStorage_returnThisDevice() { + final VolumeInfo volumeInfo = mock(VolumeInfo.class); + when(volumeInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE); + when(volumeInfo.getId()).thenReturn(VolumeInfo.ID_PRIVATE_INTERNAL); + final StorageEntry volumeStorage = new StorageEntry(mContext, volumeInfo); + + assertThat(volumeStorage.getDescription()).isEqualTo( + ResourcesUtils.getResourcesString(mContext, "storage_default_internal_storage")); + } + @Test public void getDiskId_shouldReturnDiskId() { final VolumeInfo volumeInfo = mock(VolumeInfo.class);