PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
97,082 Commits 1 Branch 0 Tags
f28f2884ddb10c5b15348f48ef018f776c24e8ee
Commit Graph

97082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arc Wang
3648d67201 Change DeepLinkHomepageActivity enable state for ACTION_USER_INITIALIZE 
Each user has different components enable state,
should update enable state of DeepLinkHomepageActivity
for Intent#ACTION_USER_INITIALIZE.

Bug: 202364984
Test: manual
      Switch user -> long click Launcher -> Wallpaper & style
      See if it shows wallpaper app's Activity.
Change-Id: If50de0f017f5cd606ba0cbf88d41eeabf3f47506
 2021-10-08 08:11:13 +00:00
Weng Su
9816b0692c [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: 58c97c30ad -s ours am: 9ae84a971a -s ours am: e14c913dcb -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: Iaf1797be9be1e41593b08e385ac206aef27259db
 2021-10-08 08:11:12 +00:00
Weng Su
b4882dd66d [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: 0be02f71e5 -s ours am: 007bb82857 -s ours am: fb2b0f5e4b -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: I947833946ae4aef40b645c967db71d6251f47a86
 2021-10-08 08:11:11 +00:00
Weng Su
9dfb9e5cc1 [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: 26af79c34c -s ours am: b4c30ce356 -s ours am: a10c40867c -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: I3f4dbab933a6095c64599dbb1daf0bbf690ccfc0
 2021-10-08 08:11:10 +00:00
Weng Su
fff5e38068 [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: 17eb3f2447 -s ours am: 97ed0c524c -s ours am: 2242a139b7 -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: I07b65ef792e9e2273867381ce95a99251998266f
 2021-10-08 08:11:08 +00:00
Weng Su
b35817a048 [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: b36fae96c5 -s ours am: 308210b3f6 -s ours am: 2f81acda9b -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: I2f14d373da7349ef08c5ff2a781affdc1c471589
 2021-10-08 08:10:51 +00:00
Weng Su
cdf6ad5441 [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: dd8e5d9f86 -s ours am: 7811b58448 -s ours am: d66f679a1c -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: I4a3b5f287bcea059c94966f1cf50126d2480c98f
 2021-10-08 08:10:50 +00:00
Weng Su
32c7d9e3d7 [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: f63feb106e -s ours am: e9e47a8108 -s ours am: 3a3b3c27dc -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: I9ab418e3bbfaa400153ea552ce6925b192f2fff4
 2021-10-08 08:10:49 +00:00
Weng Su
4eeedf99b1 [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: 6532190ccf -s ours am: e9600f3336 -s ours am: 1b5a993750 -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: I09682a4ade578db169b538d6d8e6adf0c824a41d
 2021-10-08 08:10:48 +00:00
Automerger Merge Worker
3a7771f6e4 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469 -s ours am: 9048523ba4 -s ours am: df1a21033f -s ours" into sc-v2-dev-plus-aosp am: 9ae5da0ee5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I17351bdca35d306ca370d9498be6d09a47b4d389
 2021-10-08 08:10:34 +00:00
Weng Su
3d81729517 [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: 26b65768ea -s ours am: 5bfc65b1c0 -s ours am: d9ff2b5b3f -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: I92f2a6c9ab55a016873ee9f7c46b06f391e75b68
 2021-10-08 08:10:28 +00:00
Weng Su
b839d45742 [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: bd89c97867 -s ours am: c64398a1b9 -s ours am: 7836d976d8 -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: Ic795c311747d2dd36bdb3a00a7fcc2a41f43f92f
 2021-10-08 08:10:27 +00:00
TreeHugger Robot
df6c03f1ac Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: 07fe34aa57 am: f5e2d0dcb3 am: 59d01eec17 am: 2370d34040 am: 4210a7bcae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: I19cc49e7b9677c55f16a34c9ebbf3ccd4e8a714b
 2021-10-08 08:10:17 +00:00
Weng Su
24f52b11fa [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: 5922df7f44 -s ours am: 9923ea26ef -s ours am: e4d6c530c5 -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: I3ed8121a193541e17cf477ba2f53a6d3a53a0dbd
 2021-10-08 08:10:07 +00:00
Weng Su
b878401596 [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: e81a5b9a13 -s ours am: 9effff343f -s ours am: 26ed60de74 -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: I09ad5a93b8bea1586a18bcc5af0602213d14fe7f
 2021-10-08 08:10:06 +00:00
Automerger Merge Worker
6f96f08a1a Merge "Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: f40e2700d3 am: 6e2eefe2c5 am: 7e02378a43 am: 3667dd4e0b" into sc-v2-dev-plus-aosp am: 0030a44068 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: I6858b912e153d7e71e75cb0e4d71a9b214a0ff60
 2021-10-08 08:09:57 +00:00
Weng Su
519b62291d [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d am: 1b732ee4cb am: 3d77db28a7 -s ours am: b2cb8a744d -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: I6ed7956a6c1cfa427dc05a063dfc0ee246924d46
 2021-10-08 08:09:41 +00:00
Weng Su
b6cbe23a28 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 am: 36558d2c6c -s ours am: c95ed2d0b3 -s ours am: 2d82ebf7ec -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: I94b87c490fd7157befbd3d30927172003c41b6da
 2021-10-08 08:09:39 +00:00
Weng Su
d70756080c [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b am: 372e90064b am: d243cc3d48 -s ours am: 9d340d1d94 -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: Ie614f88ba5e33579b6f0decdf7675da9e4af46ef
 2021-10-08 08:09:38 +00:00
Automerger Merge Worker
ecc7eb1f10 Merge "Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev am: df95750605 am: aeb6c685e1 am: 08aba4bb74" into sc-v2-dev-plus-aosp am: 83df22cc79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15987304

Change-Id: I3005e8a8731e7355475f18c70dfc18fcb6f438a4
 2021-10-08 08:09:31 +00:00
TreeHugger Robot
095409360e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469 -s ours am: 9048523ba4 -s ours am: 0194a12bce -s ours am: 6f4bec749d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d5bb1afa8d1e36f10b65f7d4d999063e69b08e5
 2021-10-08 08:09:17 +00:00
TreeHugger Robot
373ee6fd13 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: 07fe34aa57 am: f5e2d0dcb3 am: 59d01eec17 am: e6ef1d5c63 am: 625e1d612b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: Ic5cf3742cc4637b35e9857f10a4225829c60d3b3
 2021-10-08 08:09:10 +00:00
Chen Chen
9fe4c53597 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-qpr-dev am: 7efc9b451c am: 3449eccd85 am: 3ca98306af am: ac97c4755d am: 186fb57c59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995587

Change-Id: Ia15697e0a7e7b53b6f7369705e4829f2cc856ae6
 2021-10-08 08:09:00 +00:00
Automerger Merge Worker
73d7b51ada Merge "Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: f40e2700d3 am: 6e2eefe2c5 am: 7e02378a43 am: 293765de71" into sc-v2-dev-plus-aosp am: f45b3f570b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: If7b79189f9f133cc900cb13dc9931f128781a233
 2021-10-08 08:08:52 +00:00
Chen Chen
34363961ea BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: d9eca4893d am: ca21133410 am: d0cebdde1a am: ac48c3a2fb am: e81fcc442d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: I529343c92512bd5d9e3667e536e48c0761f5236a
 2021-10-08 08:08:36 +00:00
Automerger Merge Worker
08090b75cb Merge "Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev am: df95750605 am: aeb6c685e1 am: af77052fbe" into sc-v2-dev-plus-aosp am: 7c53f6e464 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15987304

Change-Id: I8ece7069d4838fbd64f598552a741927abdb4fd1
 2021-10-08 08:08:26 +00:00
Chen Chen
747e1689d4 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: 44deff97de am: b51bfd47db am: 5438c59920 am: c849c3ff86 am: ac22d747ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: Iba2b058842ef571f27087c5d773abc14965ac7d1
 2021-10-08 08:08:14 +00:00
Chen Chen
a8cc91fa15 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-qpr-dev am: 7efc9b451c am: 3449eccd85 am: 3ca98306af am: b5f1d06a88 am: 07e4730f10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995587

Change-Id: I9db6f234e8279a60f99b18640ea1d27f4becab10
 2021-10-08 08:08:04 +00:00
Automerger Merge Worker
41f215e5a2 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: d9eca4893d am: ca21133410 am: d0cebdde1a am: 28527975e8" into sc-v2-dev-plus-aosp am: 5b40aba16b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: I7e9fc4da8437e94fe6b1c095240947000c0d41a0
 2021-10-08 08:07:56 +00:00
TreeHugger Robot
c00f46203d Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 074f18fd8b am: 9f388f2a66 am: 15189d2ff6 am: ef0bd08a22 am: d470e7a1aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986

Change-Id: I6c9b25b6f648456bb0cd21115a1e66411952401d
 2021-10-08 08:07:39 +00:00
Automerger Merge Worker
a38ad81617 Merge "Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 818a481294 am: 050872ecf0 am: cbe25da458 am: d542e403b9" into sc-v2-dev-plus-aosp am: 7eb2501218 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986

Change-Id: Ie225af5bd236071c0ceae19cb2755afe4031f370
 2021-10-08 08:07:31 +00:00
Chen Chen
a729a76d49 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: 44deff97de am: b51bfd47db am: 5438c59920 am: 85fbe04e1c am: bb58950b4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: Ic588fa2ab827d2146c6d72c1ce3dc148faf672af
 2021-10-08 08:07:16 +00:00
Automerger Merge Worker
6a3651d10d [automerger skipped] Merge changes from topic "am-ea89e571cc6e473fbf0101de439fe785" into sc-v2-dev-plus-aosp am: 89a780e0de -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I5f25c2c1f4396604128f2877ddf2fcf5082ea663
 2021-10-08 08:07:07 +00:00
TreeHugger Robot
9c596c294c Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 074f18fd8b am: 9f388f2a66 am: 15189d2ff6 am: 5f0c95ccfc am: b34bb6e3fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986

Change-Id: I3715951ac836f67b1c76ba398a60fc483ec22eae
 2021-10-08 08:06:54 +00:00
TreeHugger Robot
dffe15dd8f Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 818a481294 am: 050872ecf0 am: cbe25da458 am: 3a7f8c45d1 am: 40eddcf790 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986

Change-Id: I185d46334bcbc42025fdf84ee110289ce3381e26
 2021-10-08 08:06:45 +00:00
Automerger Merge Worker
90cfb3c1af [automerger skipped] Merge changes from topic "am-603210be7bca4b488a2eadf8eec75652" into sc-v2-dev-plus-aosp am: 0e8a6be197 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ia78b7a6c1570d2cb9f239bea9122e963b02dd845
 2021-10-08 08:06:37 +00:00
Weng Su
a42860c224 [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: 0e2cd55dfb -s ours am: 53cc80bc17 -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: I9f4b038f6152e3d9a09c7b9be49d37678a159dbf
 2021-10-08 08:06:24 +00:00
Weng Su
b04d7a4752 [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: 21636df6f0 -s ours am: fe473effc8 -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: If4c03b7ff816e2c80cf43a14e0d34b53c27dad50
 2021-10-08 08:06:23 +00:00
Weng Su
b232d1ac75 [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: a4e6370acf -s ours am: e1ed2d0a49 -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: If288d006e7c3df2c3fa6b1a5161306e93949eacb
 2021-10-08 08:06:22 +00:00
Weng Su
15cb9e17bf [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: 4212f9d165 -s ours am: f471e87757 -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: I5c3ff4f9f40e22de14671510ed0413da8282675c
 2021-10-08 08:06:20 +00:00
Weng Su
8884783da0 [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: 6cd196ebf9 -s ours am: b386c3ce8d -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: I94d743651e362bd219c687a99f1a4766d21f1c8d
 2021-10-08 08:06:04 +00:00
Weng Su
3b662cff60 [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: 730163ba73 -s ours am: dd2eb72183 -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: I159b07e808a2d203117ed64056146c8afe73bbeb
 2021-10-08 08:06:03 +00:00
Weng Su
2490766d9d [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: 5c494ff294 -s ours am: 7691126c5c -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: Icdec732d1509d8e57821003aee521014ac92f505
 2021-10-08 08:06:01 +00:00
Weng Su
fac54e6bd5 [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: b2761dd93d -s ours am: 5ed0bd812b -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: Ia06bdfb733a6e48042e660aa2cebccbf89e10696
 2021-10-08 08:06:00 +00:00
Weng Su
913b3bed90 [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: 0439d3baca -s ours am: 7a5838135c -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: I08b203fbc1db981f2268ac89737fe2ac041eab64
 2021-10-08 08:05:44 +00:00
Weng Su
ad8686d2a9 [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: 097eef0b83 -s ours am: affec36497 -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: I5bec47243eecff4d22e3b6a2d532958ab6a5a97b
 2021-10-08 08:05:43 +00:00
Automerger Merge Worker
2a4668ccc9 [automerger skipped] Merge changes from topic "am-aaa7d89ac39d4f63b72ca511f2b60832" into sc-v2-dev-plus-aosp am: 22a096c969 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I24c7963f542e76992b10ff4f520b3e860d76965f
 2021-10-08 08:05:35 +00:00
Weng Su
689f915b39 [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: 163e2e711c -s ours am: 3853c5e80e -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: If9d6f595f2e13769c13a23dd7a8fb935f81898bd
 2021-10-08 08:05:25 +00:00
Weng Su
99d62f2613 [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: 4ab81c701e -s ours am: a72319cbe9 -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: I531737f19bc964ca56fafd81153f37f459f00c87
 2021-10-08 08:05:23 +00:00
Automerger Merge Worker
777f105a48 [automerger skipped] Merge changes from topic "am-b5e91ab227294ed58bbb399b5c08944f" into sc-v2-dev-plus-aosp am: 19e06f74c8 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I4051584aaddf82f30edb20c6eb27639a7108b148
 2021-10-08 08:05:15 +00:00