Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b27c91a authored by Amith Yamasani's avatar Amith Yamasani
Browse files

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
parent 610538e1

src/com/android/settings/slices/SlicesIndexer.java

+2 −2
Original line number Diff line number Diff line
@@ -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();

tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }

tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

tests/robotests/src/com/android/settings/slices/SliceTestUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -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);