diff options
| author | Weilun Du <wdu@google.com> | 2018-05-10 21:03:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-10 21:03:43 +0000 |
| commit | 31f353b49b46d136598f666449a589a2d63bde54 (patch) | |
| tree | 22d5bb46383b9b356c7d273073e9b5149aae969d | |
| parent | 82cb599f28221115440f6c38ad88feff1cfa484f (diff) | |
| parent | e8fa0da5ce1ec1e37cd47a8bd38d76e82352233d (diff) | |
| download | TvSettings-31f353b49b46d136598f666449a589a2d63bde54.tar.gz | |
Merge "Fixed the crash in TV setting when formating SD card as private" into pi-dev
2 files changed, 2 insertions, 2 deletions
diff --git a/Settings/src/com/android/tv/settings/device/storage/SettingsStorageService.java b/Settings/src/com/android/tv/settings/device/storage/SettingsStorageService.java index d29a2bffb..467b03f0c 100644 --- a/Settings/src/com/android/tv/settings/device/storage/SettingsStorageService.java +++ b/Settings/src/com/android/tv/settings/device/storage/SettingsStorageService.java @@ -142,7 +142,7 @@ public class SettingsStorageService { try { final StorageManager storageManager = getSystemService(StorageManager.class); storageManager.partitionPrivate(diskId); - final long internalBench = storageManager.benchmark(null); + final long internalBench = storageManager.benchmark("private"); final VolumeInfo privateVol = findPrivateVolume(storageManager, diskId); final long privateBench; diff --git a/Settings/tests/robotests/src/com/android/tv/settings/device/storage/SettingsStorageServiceTest.java b/Settings/tests/robotests/src/com/android/tv/settings/device/storage/SettingsStorageServiceTest.java index 407f97edf..908f399de 100644 --- a/Settings/tests/robotests/src/com/android/tv/settings/device/storage/SettingsStorageServiceTest.java +++ b/Settings/tests/robotests/src/com/android/tv/settings/device/storage/SettingsStorageServiceTest.java @@ -161,7 +161,7 @@ public class SettingsStorageServiceTest { volumeInfos.add(volumeInfo); doReturn(volumeInfos).when(mMockStorageManager).getVolumes(); - doReturn(123L).when(mMockStorageManager).benchmark(null); + doReturn(123L).when(mMockStorageManager).benchmark("private"); doReturn(456L).when(mMockStorageManager).benchmark("jkl;"); final Intent formatIntent = new Intent(SettingsStorageService.ACTION_FORMAT_AS_PRIVATE); |