PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,734 Commits 1 Branch 0 Tags
aaa0fa040bf69ce014cd4aacda581b72b06ad4a6
Commit Graph

84734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
aaa0fa040b [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 0dc4560066 -s ours am: 68952164ad -s ours am: 9552e28699 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164

Change-Id: I7173bb324e86990b14036486c4920b02f01a9766
 2021-10-08 07:39:30 +00:00
Weng Su
d763f14341 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -s ours am: 7ab58102ff -s ours am: 80d84e4053 -s ours am: b462c1d9d5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164

Change-Id: Idcffae76635440acba39579a3e139f688ddb0f7e
 2021-10-08 07:39:29 +00:00
Weng Su
c6d1339573 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500 am: cbd0883356 -s ours am: 1f4b0eaa6f -s ours am: bd3dcfc61a -s ours am: 428d973b15 -s ours am: d9a3681733 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163

Change-Id: Idbcd39623890f2f9a2b0243f8c7e42fbc55b6833
 2021-10-08 07:39:28 +00:00
Weng Su
dc73326e39 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -s ours am: 2323109f93 -s ours am: 77e284042e -s ours am: 6ba2996eec -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162

Change-Id: I72a7ba7864812835dc377fb34a35fa67f36f6c19
 2021-10-08 07:39:28 +00:00
Weng Su
0e2cd55dfb [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 54abe21d12 -s ours am: c0dd58ee8c -s ours am: 55a37d556e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164

Change-Id: Ibcaa22901d70ef28982a205c6eb5c485d41cac96
 2021-10-08 07:39:17 +00:00
Weng Su
21636df6f0 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -s ours am: 9e73b1e4ed -s ours am: 1dbd53eb70 -s ours am: ba11285fd6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164

Change-Id: Ic3901313b09efb30da0397ae0dd87a31db1eb2b5
 2021-10-08 07:39:17 +00:00
Weng Su
a4e6370acf [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500 am: cbd0883356 -s ours am: 1f4b0eaa6f -s ours am: 70fce50634 -s ours am: ad77ce9784 -s ours am: d3fd57e2e1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163

Change-Id: I6330f3b0fcf0412c040b5db6bfc63b4e1f467643
 2021-10-08 07:39:16 +00:00
Weng Su
4212f9d165 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -s ours am: 36a13c0cfe -s ours am: 6b29f7110a -s ours am: ec9d3cf201 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162

Change-Id: I897e32a6770d7c61204effef92255ff6943dba1b
 2021-10-08 07:39:16 +00:00
Weng Su
0439d3baca [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: aed1ab9e45 -s ours am: 00e38c59cc -s ours am: c3531fb273 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167

Change-Id: If0aae24e0fbc0defa04f9a3ee4b4be8e0f71f32b
 2021-10-08 07:39:06 +00:00
Weng Su
097eef0b83 [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: f05b8fbb79 -s ours am: 107ebcdc9e -s ours am: 658383d2e3 -s ours 
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166

Change-Id: Id048b49e76793e39dd3e7d5594942db98ac243e4
 2021-10-08 07:39:06 +00:00
Weng Su
499e526da1 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: 395ac6073c -s ours am: 374ef0012a -s ours am: 504af9e6cd -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167

Change-Id: Ic02c7e10aa692466389a1610ed8843690fc2b827
 2021-10-08 07:39:01 +00:00
Weng Su
1c6bdf023f [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: d5ff68889c -s ours am: b885452051 -s ours am: 5c878f37a6 -s ours 
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166

Change-Id: I20853bdff515a8de7515498c929ab204c3fb8f78
 2021-10-08 07:39:00 +00:00
Weng Su
e579105a14 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d am: 973211dba5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174

Change-Id: I06ef5c77f0b7eca0f15b78f83b8fd2db3fb29351
 2021-10-08 07:38:55 +00:00
Weng Su
bcd7792138 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 -s ours am: 77d30c4d0c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620

Change-Id: Ia0c535eff0c406c9b5e52e541a9d75b16e703f29
 2021-10-08 07:38:54 +00:00
Weng Su
ca90ea9e47 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b am: 1400ff3139 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170

Change-Id: Iffd455b9592dc57114e8bab3d2a5b7a0f7e197a7
 2021-10-08 07:38:53 +00:00
Weng Su
9552e28699 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 0dc4560066 -s ours am: 68952164ad -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164

Change-Id: If10c14a8684381b8bca2aec21ab65164e746054f
 2021-10-08 07:22:57 +00:00
Weng Su
b462c1d9d5 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -s ours am: 7ab58102ff -s ours am: 80d84e4053 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164

Change-Id: I6ee71b203ad83d4db30d2501b25937438e425233
 2021-10-08 07:22:57 +00:00
Weng Su
d9a3681733 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500 am: cbd0883356 -s ours am: 1f4b0eaa6f -s ours am: bd3dcfc61a -s ours am: 428d973b15 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163

Change-Id: I82c01505792795b7c20e5f333729c62e05c8a134
 2021-10-08 07:22:56 +00:00
Weng Su
6ba2996eec [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -s ours am: 2323109f93 -s ours am: 77e284042e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162

Change-Id: Iaf5248d7efca0d9fa2e51c72b2372e1274070e8e
 2021-10-08 07:22:56 +00:00
Weng Su
55a37d556e [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 54abe21d12 -s ours am: c0dd58ee8c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164

Change-Id: I2f2a64cbd1406114f5f78096f55157374645058d
 2021-10-08 07:22:45 +00:00
Weng Su
ba11285fd6 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -s ours am: 9e73b1e4ed -s ours am: 1dbd53eb70 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164

Change-Id: I4ac66df5cddf34fd1b04f6692dd9d86336f2cbed
 2021-10-08 07:22:44 +00:00
Weng Su
d3fd57e2e1 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500 am: cbd0883356 -s ours am: 1f4b0eaa6f -s ours am: 70fce50634 -s ours am: ad77ce9784 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163

Change-Id: Ie75a528a63e6388a75aa3b7775a04a069b162379
 2021-10-08 07:22:44 +00:00
Weng Su
ec9d3cf201 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -s ours am: 36a13c0cfe -s ours am: 6b29f7110a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162

Change-Id: Id33776fcdd4f347604e6ccc9290dee92ca59a4dd
 2021-10-08 07:22:43 +00:00
Weng Su
c3531fb273 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: aed1ab9e45 -s ours am: 00e38c59cc -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167

Change-Id: I3b3b4fdc30ed2db92f19c0b452fa1cef53d3e841
 2021-10-08 07:22:34 +00:00
Weng Su
658383d2e3 [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: f05b8fbb79 -s ours am: 107ebcdc9e -s ours 
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166

Change-Id: Ie3889e39febe5e07f927e5740b48fc0f30a836db
 2021-10-08 07:22:33 +00:00
Weng Su
504af9e6cd [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: 395ac6073c -s ours am: 374ef0012a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167

Change-Id: I305b55c515a15900ed007c56cb6f5362b3b09c6e
 2021-10-08 07:22:28 +00:00
Weng Su
5c878f37a6 [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: d5ff68889c -s ours am: b885452051 -s ours 
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166

Change-Id: I578872acacdb22c11ef08b1ebb33311d05664475
 2021-10-08 07:22:28 +00:00
Weng Su
973211dba5 [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174

Change-Id: Ib42cd4909a5d6265ee2a3181df4c34b0c32a79bb
 2021-10-08 07:22:21 +00:00
Weng Su
77d30c4d0c [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 -s ours 
am skip reason: skipped by user wengsu

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620

Change-Id: I5d0fa94c0b09106bb65764ffbd4636209f685c35
 2021-10-08 07:22:20 +00:00
Weng Su
1400ff3139 [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170

Change-Id: Ie039408dcee182693303390eca26386ff6c546d2
 2021-10-08 07:22:20 +00:00
TreeHugger Robot
d754409050 Merge "Update to new method of getting display power profile constants" into sc-v2-dev 2021-10-08 02:28:51 +00:00
Bonian Chen
c915df88b7 Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev am: 78c18a1b45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15993432

Change-Id: I295924575236c7101f3784f8c9f102d2f5dc49a5
 2021-10-08 00:01:14 +00:00
Bonian Chen
78c18a1b45 Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev 2021-10-07 23:42:43 +00:00
Arc Wang
d2cb885c32 Merge "[Large screen] Fix SplitPaitRule not match for deep link problem" into sc-v2-dev 2021-10-07 10:25:37 +00:00
Arc Wang
dcc46cf136 [Large screen] Fix SplitPaitRule not match for deep link problem 
- Set both secondary ComponentName and secondary Intent action
  in SplitPairFilter when registering SplitPairRule for deep link.

- Set ComponentName to the Intent which DeepLinkHomepageActivity
  uses to start the deep link page.

This change setup Intent and SplitPairRule to have both
Intent action and ComponentName. It fixes matching problem.

Bug: 201627196
Bug: 199888089
Test: manual
      [Unfolded] Long press home (workspace) -> Pop-up menu ->
      Tap 'Wallpaper & style' -> Launch Settings in the left as
      list and 'Wallpaper & style' in the right as detail.
Change-Id: I8cc8cef911ce0d7d05f332eb86f77f8d2543827f
 2021-10-07 17:44:24 +08:00
TreeHugger Robot
69c9e424e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000259

Change-Id: Ia8eba6d2c5e57bb52b4a5f35b954fb01e0714161
 2021-10-07 08:51:58 +00:00
TreeHugger Robot
dd3651cc5e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-10-07 08:40:55 +00:00
TreeHugger Robot
57e7d9c4b3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-07 08:40:47 +00:00
Bill Yi
c18019db27 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idb42ad66d7b7212c8f9c131f939a08b674f3c640
 2021-10-07 02:41:09 +00:00
Bill Yi
98f9ed5934 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia9a8641798558c7df5e1d65aadaf5ca9f15fc080
 2021-10-07 02:37:16 +00:00
Chen Chen
4f2a6225c9 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345

Change-Id: Iad645cc93ddf67fa9cd96b2813f0a4a10f48b007
 2021-10-07 00:44:33 +00:00
TreeHugger Robot
7d4dd26362 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-v2-dev 2021-10-06 22:45:23 +00:00
Weng Su
68952164ad [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 0dc4560066 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164

Change-Id: Ied28ec14a4ce1b9e32b155d4a7366aa8c1448ab5
 2021-10-06 20:00:28 +00:00
Weng Su
80d84e4053 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -s ours am: 7ab58102ff -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164

Change-Id: Ide926ed389d319955335c51e62e82481e4a1253b
 2021-10-06 20:00:27 +00:00
Weng Su
428d973b15 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500 am: cbd0883356 -s ours am: 1f4b0eaa6f -s ours am: bd3dcfc61a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163

Change-Id: Ifd3aab857e11d595387fe735cba89f79e73a50b9
 2021-10-06 20:00:26 +00:00
Weng Su
77e284042e [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -s ours am: 2323109f93 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162

Change-Id: Ib32827bc5dbd60ff56453afbc093c33e2d758cf0
 2021-10-06 20:00:23 +00:00
Weng Su
c0dd58ee8c [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 54abe21d12 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164

Change-Id: I53212e8b04ccd549b798e8bc9a4c1e761851e9ce
 2021-10-06 19:38:30 +00:00
Weng Su
1dbd53eb70 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5 am: 0fe85baf93 -s ours am: 9ccd76cbde -s ours am: 9e73b1e4ed -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164

Change-Id: I33ac8f836090c7932bba3c653773e2f4351ddbb8
 2021-10-06 19:38:28 +00:00
Weng Su
ad77ce9784 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500 am: cbd0883356 -s ours am: 1f4b0eaa6f -s ours am: 70fce50634 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163

Change-Id: Id2f473e2997375f9850ee82452c2507d66257240
 2021-10-06 19:38:27 +00:00
Weng Su
6b29f7110a [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431 am: 457a63ce84 -s ours am: f41979632a -s ours am: 36a13c0cfe -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162

Change-Id: I5718fce8f4017922fb851e9295c0702d3f9dadeb
 2021-10-06 19:38:24 +00:00