From 28608774cb744c0b1a05b93b635018b127e27d8a Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Sat, 28 May 2022 05:20:37 +0000 Subject: [PATCH 1/3] Update biometrics OWNERS Bug: 234195983 Test: N/A Change-Id: I9843d0d6fad638cd14296624b11f86a273baab1c --- src/com/android/settings/biometrics/OWNERS | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/biometrics/OWNERS b/src/com/android/settings/biometrics/OWNERS index 99dd6548b26..7ea9926992f 100644 --- a/src/com/android/settings/biometrics/OWNERS +++ b/src/com/android/settings/biometrics/OWNERS @@ -1,11 +1,12 @@ -# Default reviewers for this and subdirectories. -curtislb@google.com graciecheng@google.com ilyamaty@google.com jaggies@google.com jbolinger@google.com +jeffpu@google.com joshmccloskey@google.com -kchyn@google.com -yukl@google.com -# Emergency approvers in case the above are not available +firewall@google.com +jasonsfchang@google.com +lbill@google.com +mingjuwu@google.com + From 51a056ec3294975f56da1a80ad4bc0045ae42490 Mon Sep 17 00:00:00 2001 From: menghanli Date: Tue, 31 May 2022 07:46:45 +0800 Subject: [PATCH 2/3] Polish reset display size and text dialog content Use "tablet" for tablet devices; use "phone" for default Bug: 233985662 Test: Manual testing Change-Id: I24e54315414502dc61efb733bbf697783b1de87a --- res/values/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 85c653e6a21..71f4e148d9d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5327,7 +5327,9 @@ Reset display size and text? - Your display size and text preferences will reset to the phone\u2019s original settings + Your display size and text preferences will reset to the phone\u2019s original settings + + Your display size and text preferences will reset to the tablet\u2019s original settings Reset From 1b27c91a7b001e9c9e83b4206ae440041bfa6ace Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Sat, 28 May 2022 05:36:44 +0000 Subject: [PATCH 3/3] 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);