From 1b27c91a7b001e9c9e83b4206ae440041bfa6ace Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Sat, 28 May 2022 05:36:44 +0000 Subject: [PATCH] Use Uri.toString() instead of Uri.toSafeString() Uri.toSafeString strips out paths and shouldn't be used for situations other than logging. Bug: 232694281 Test: PtsPowerTestCases Change-Id: Iec835b738c3e928e922bd6a14573106f2ce4f526 --- src/com/android/settings/slices/SlicesIndexer.java | 4 ++-- .../settings/search/SearchFeatureProviderImplTest.java | 2 +- .../android/settings/slices/SliceBroadcastReceiverTest.java | 4 ++-- .../com/android/settings/slices/SliceDataConverterTest.java | 4 ++-- .../src/com/android/settings/slices/SliceTestUtils.java | 2 +- .../unit/src/com/android/settings/slices/SliceTestUtils.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/com/android/settings/slices/SlicesIndexer.java b/src/com/android/settings/slices/SlicesIndexer.java index ac30c6c0a41..0160843d8e7 100644 --- a/src/com/android/settings/slices/SlicesIndexer.java +++ b/src/com/android/settings/slices/SlicesIndexer.java @@ -101,7 +101,7 @@ class SlicesIndexer implements Runnable { for (SliceData dataRow : indexData) { values = new ContentValues(); values.put(IndexColumns.KEY, dataRow.getKey()); - values.put(IndexColumns.SLICE_URI, dataRow.getUri().toSafeString()); + values.put(IndexColumns.SLICE_URI, dataRow.getUri().toString()); values.put(IndexColumns.TITLE, dataRow.getTitle()); values.put(IndexColumns.SUMMARY, dataRow.getSummary()); final CharSequence screenTitle = dataRow.getScreenTitle(); @@ -122,4 +122,4 @@ class SlicesIndexer implements Runnable { values); } } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java index 15a124df434..f3496001d09 100644 --- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java @@ -120,7 +120,7 @@ public class SearchFeatureProviderImplTest { final Intent searchIntent = mProvider.buildSearchIntent(mActivity, SettingsEnums.TESTING); final Uri referrer = searchIntent.getParcelableExtra(Intent.EXTRA_REFERRER); - assertThat(referrer.toSafeString()).isEqualTo( + assertThat(referrer.toString()).isEqualTo( "android-app://" + mActivity.getPackageName() + "/" + SettingsEnums.TESTING); } diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java index f47c5f95edf..fa1fed559a9 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java @@ -332,7 +332,7 @@ public class SliceBroadcastReceiverTest { values.put(SlicesDatabaseHelper.IndexColumns.ICON_RESOURCE, SliceTestUtils.FAKE_ICON); values.put(SlicesDatabaseHelper.IndexColumns.FRAGMENT, SliceTestUtils.FAKE_FRAGMENT_NAME); values.put(SlicesDatabaseHelper.IndexColumns.CONTROLLER, controllerClass); - values.put(SlicesDatabaseHelper.IndexColumns.SLICE_URI, buildUri(key).toSafeString()); + values.put(SlicesDatabaseHelper.IndexColumns.SLICE_URI, buildUri(key).toString()); values.put(SlicesDatabaseHelper.IndexColumns.HIGHLIGHT_MENU_RESOURCE, SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES); mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values); @@ -357,4 +357,4 @@ public class SliceBroadcastReceiverTest { return true; } } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java index 0c654a46b06..69f1886db20 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java @@ -121,7 +121,7 @@ public class SliceDataConverterTest { assertThat(fakeSlice.getScreenTitle()).isEqualTo(FAKE_SCREEN_TITLE); assertThat(fakeSlice.getKeywords()).isNull(); assertThat(fakeSlice.getIconResource()).isNotNull(); - assertThat(fakeSlice.getUri().toSafeString()) + assertThat(fakeSlice.getUri().toString()) .isEqualTo("content://com.android.settings.slices/action/key"); assertThat(fakeSlice.getFragmentClassName()).isEqualTo(FAKE_FRAGMENT_CLASSNAME); assertThat(fakeSlice.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME); @@ -160,4 +160,4 @@ public class SliceDataConverterTest { return serviceInfoList; } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/slices/SliceTestUtils.java b/tests/robotests/src/com/android/settings/slices/SliceTestUtils.java index 97beeb32471..d6a0b5e8b81 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceTestUtils.java +++ b/tests/robotests/src/com/android/settings/slices/SliceTestUtils.java @@ -64,7 +64,7 @@ class SliceTestUtils { : SettingsSliceProvider.SLICE_AUTHORITY) .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION) .appendPath(key) - .build().toSafeString()); + .build().toString()); values.put(SlicesDatabaseHelper.IndexColumns.TITLE, FAKE_TITLE); values.put(SlicesDatabaseHelper.IndexColumns.SUMMARY, FAKE_SUMMARY); values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, FAKE_SCREEN_TITLE); diff --git a/tests/unit/src/com/android/settings/slices/SliceTestUtils.java b/tests/unit/src/com/android/settings/slices/SliceTestUtils.java index 40a827a8a99..020bde2fb73 100644 --- a/tests/unit/src/com/android/settings/slices/SliceTestUtils.java +++ b/tests/unit/src/com/android/settings/slices/SliceTestUtils.java @@ -64,7 +64,7 @@ class SliceTestUtils { : SettingsSliceProvider.SLICE_AUTHORITY) .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION) .appendPath(key) - .build().toSafeString()); + .build().toString()); values.put(SlicesDatabaseHelper.IndexColumns.TITLE, FAKE_TITLE); values.put(SlicesDatabaseHelper.IndexColumns.SUMMARY, FAKE_SUMMARY); values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, FAKE_SCREEN_TITLE);