PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Uri.toString() instead of Uri.toSafeString()

Browse Source 
Uri.toSafeString strips out paths and shouldn't be used
for situations other than logging.

Bug: 232694281
Test: PtsPowerTestCases
Change-Id: Iec835b738c3e928e922bd6a14573106f2ce4f526
This commit is contained in:
Amith Yamasani
2022-05-28 05:36:44 +00:00
parent 610538e10b
commit 1b27c91a7b
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/slices/SlicesIndexer.java
View File

@@ -101,7 +101,7 @@ class SlicesIndexer implements Runnable {
for (SliceData dataRow : indexData) { for (SliceData dataRow : indexData) {
values = new ContentValues(); values = new ContentValues();
values.put(IndexColumns.KEY, dataRow.getKey()); 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.TITLE, dataRow.getTitle());
values.put(IndexColumns.SUMMARY, dataRow.getSummary()); values.put(IndexColumns.SUMMARY, dataRow.getSummary());
final CharSequence screenTitle = dataRow.getScreenTitle(); final CharSequence screenTitle = dataRow.getScreenTitle();
@@ -122,4 +122,4 @@ class SlicesIndexer implements Runnable {
values); values);
} }
} }
} }

2
tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
View File

@@ -120,7 +120,7 @@ public class SearchFeatureProviderImplTest {
final Intent searchIntent = mProvider.buildSearchIntent(mActivity, SettingsEnums.TESTING); final Intent searchIntent = mProvider.buildSearchIntent(mActivity, SettingsEnums.TESTING);
final Uri referrer = searchIntent.getParcelableExtra(Intent.EXTRA_REFERRER); final Uri referrer = searchIntent.getParcelableExtra(Intent.EXTRA_REFERRER);
assertThat(referrer.toSafeString()).isEqualTo( assertThat(referrer.toString()).isEqualTo(
"android-app://" + mActivity.getPackageName() + "/" + SettingsEnums.TESTING); "android-app://" + mActivity.getPackageName() + "/" + SettingsEnums.TESTING);
} }

4
tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
View File

@@ -332,7 +332,7 @@ public class SliceBroadcastReceiverTest {
values.put(SlicesDatabaseHelper.IndexColumns.ICON_RESOURCE, SliceTestUtils.FAKE_ICON); values.put(SlicesDatabaseHelper.IndexColumns.ICON_RESOURCE, SliceTestUtils.FAKE_ICON);
values.put(SlicesDatabaseHelper.IndexColumns.FRAGMENT, SliceTestUtils.FAKE_FRAGMENT_NAME); values.put(SlicesDatabaseHelper.IndexColumns.FRAGMENT, SliceTestUtils.FAKE_FRAGMENT_NAME);
values.put(SlicesDatabaseHelper.IndexColumns.CONTROLLER, controllerClass); 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, values.put(SlicesDatabaseHelper.IndexColumns.HIGHLIGHT_MENU_RESOURCE,
SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES); SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES);
mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values); mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
@@ -357,4 +357,4 @@ public class SliceBroadcastReceiverTest {
return true; return true;
} }
} }
} }

4
tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
View File

@@ -121,7 +121,7 @@ public class SliceDataConverterTest {
assertThat(fakeSlice.getScreenTitle()).isEqualTo(FAKE_SCREEN_TITLE); assertThat(fakeSlice.getScreenTitle()).isEqualTo(FAKE_SCREEN_TITLE);
assertThat(fakeSlice.getKeywords()).isNull(); assertThat(fakeSlice.getKeywords()).isNull();
assertThat(fakeSlice.getIconResource()).isNotNull(); assertThat(fakeSlice.getIconResource()).isNotNull();
assertThat(fakeSlice.getUri().toSafeString()) assertThat(fakeSlice.getUri().toString())
.isEqualTo("content://com.android.settings.slices/action/key"); .isEqualTo("content://com.android.settings.slices/action/key");
assertThat(fakeSlice.getFragmentClassName()).isEqualTo(FAKE_FRAGMENT_CLASSNAME); assertThat(fakeSlice.getFragmentClassName()).isEqualTo(FAKE_FRAGMENT_CLASSNAME);
assertThat(fakeSlice.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME); assertThat(fakeSlice.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME);
@@ -160,4 +160,4 @@ public class SliceDataConverterTest {
return serviceInfoList; return serviceInfoList;
} }
} }

2
tests/robotests/src/com/android/settings/slices/SliceTestUtils.java
View File

@@ -64,7 +64,7 @@ class SliceTestUtils {
: SettingsSliceProvider.SLICE_AUTHORITY) : SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION) .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath(key) .appendPath(key)
.build().toSafeString()); .build().toString());
values.put(SlicesDatabaseHelper.IndexColumns.TITLE, FAKE_TITLE); values.put(SlicesDatabaseHelper.IndexColumns.TITLE, FAKE_TITLE);
values.put(SlicesDatabaseHelper.IndexColumns.SUMMARY, FAKE_SUMMARY); values.put(SlicesDatabaseHelper.IndexColumns.SUMMARY, FAKE_SUMMARY);
values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, FAKE_SCREEN_TITLE); values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, FAKE_SCREEN_TITLE);

2
tests/unit/src/com/android/settings/slices/SliceTestUtils.java
View File

@@ -64,7 +64,7 @@ class SliceTestUtils {
: SettingsSliceProvider.SLICE_AUTHORITY) : SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION) .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath(key) .appendPath(key)
.build().toSafeString()); .build().toString());
values.put(SlicesDatabaseHelper.IndexColumns.TITLE, FAKE_TITLE); values.put(SlicesDatabaseHelper.IndexColumns.TITLE, FAKE_TITLE);
values.put(SlicesDatabaseHelper.IndexColumns.SUMMARY, FAKE_SUMMARY); values.put(SlicesDatabaseHelper.IndexColumns.SUMMARY, FAKE_SUMMARY);
values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, FAKE_SCREEN_TITLE); values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, FAKE_SCREEN_TITLE);