Commit Graph

85963 Commits

Author SHA1 Message Date
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
Xin Li
b2fadd3b8a [automerger skipped] Merge "Merge Android 12" am: 433825250d -s ours am: 7062f8326d -s ours
am skip reason: Merged-In Ib853137811901796f73e4d720accb3249a7db963 with SHA-1 8aa74d1ad4 is already in history

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

Change-Id: I6aa40f4ae668620b39543f7a147c49b4689dc9f2
2021-10-08 01:39:33 +00:00
Xin Li
7062f8326d [automerger skipped] Merge "Merge Android 12" am: 433825250d -s ours
am skip reason: Merged-In Ib853137811901796f73e4d720accb3249a7db963 with SHA-1 8aa74d1ad4 is already in history

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

Change-Id: I173e87e7a921aea51b68edc5056925bb21e7dbba
2021-10-08 01:21:41 +00:00
Android Build Coastguard Worker
51dcfa291c Snap for 7804438 from 78c18a1b45 to sc-qpr1-release
Change-Id: I3779a75fa12ffb83cc91a04ea2d71f1b10e1b501
2021-10-08 01:08:00 +00:00
Bonian Chen
ca721649c8 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: I1b2cd3afdd506f14f0bb7f8f02299fc8b26116d9
2021-10-08 00:01:10 +00:00
Xin Li
433825250d Merge "Merge Android 12" 2021-10-07 23:50:04 +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
TreeHugger Robot
d3de9d4b6c [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: Iad798b30be36844d9812501e49da3800115db0c9
2021-10-07 08:52:12 +00:00
TreeHugger Robot
824f21616b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469 -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: I8182f906e121937261ad6ee30c22569d3ef142f1
2021-10-07 08:50:25 +00:00
TreeHugger Robot
6228bd3469 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-07 08:40:50 +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
98f9ed5934 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia9a8641798558c7df5e1d65aadaf5ca9f15fc080
2021-10-07 02:37:16 +00:00
Bill Yi
e57cfc0865 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaaafbbba20f60a2937e5947b4a90e13fb8a6d3ad
2021-10-07 02:33:44 +00:00
TreeHugger Robot
445ea21c1e Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: 07fe34aa57 am: f5e2d0dcb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: I67bb72dac3971103b4bf91cee8c63ef0ce3674df
2021-10-07 01:16:42 +00:00
TreeHugger Robot
b13e76c167 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: f40e2700d3 am: 6e2eefe2c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: If2f46fa7b3d684c5a3751b41471ba80f7dbe7f6d
2021-10-07 01:16:33 +00:00
Android Build Coastguard Worker
2b3bc31976 Snap for 7800528 from d408d7c408 to sc-qpr1-release
Change-Id: I03666d0ae91a3a1ddce57ec6a5edf180fd97137a
2021-10-07 01:08:56 +00:00
TreeHugger Robot
f5e2d0dcb3 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: 07fe34aa57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: Ic13a97f4c56063faccadc41f0a668c5a936547b6
2021-10-07 01:01:54 +00:00
TreeHugger Robot
6e2eefe2c5 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: f40e2700d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: Id3557d671fd5cf5f4151cad2dabf8761a771c7fb
2021-10-07 00:57:09 +00:00
Chen Chen
579e48b03d 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: I25d658e8c82a1e45a69fdd3467309e897e10e8d5
2021-10-07 00:44:35 +00:00
TreeHugger Robot
07fe34aa57 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: Ic07988e901c9f8f4784c38470a9454c60dc826bf
2021-10-07 00:44:18 +00:00
TreeHugger Robot
f40e2700d3 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: I991b5ba56c85c943009cf15952ed2d02241ba96a
2021-10-07 00:44:18 +00:00
TreeHugger Robot
94768f3b18 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: Id17befe12f90736d477de4f52d3bd101228a68f0
2021-10-07 00:29:41 +00:00
TreeHugger Robot
81a3e690c1 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: I5a5227a53faaadc78e1bebf725671f04adb0f2c9
2021-10-07 00:17:38 +00:00
TreeHugger Robot
4f63f0c9e1 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev am: df95750605
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15987304

Change-Id: I07e1c26b0635aad836cc2b54cefb9ca7428823b3
2021-10-07 00:07:37 +00:00
TreeHugger Robot
2642a3c73e Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev 2021-10-07 00:03:46 +00:00
TreeHugger Robot
df95750605 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev 2021-10-06 23:54:52 +00:00
Xin Li
47a40615ea Merge Android 12
Bug: 202323961
Merged-In: Ib853137811901796f73e4d720accb3249a7db963
Change-Id: I2febbf79bb9858cd6c7a5e1c47bcecbac83398fd
2021-10-06 22:53:58 +00:00
Chen Chen
d67647327d Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-qpr-dev am: 7efc9b451c am: 3449eccd85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995587

Change-Id: I2f629f97fe2284a5bb916782b9064f4bfb3f0e28
2021-10-06 22:42:27 +00:00
Chen Chen
3449eccd85 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-qpr-dev am: 7efc9b451c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995587

Change-Id: Ida2ac136c8d2788297aa9b38570f918cc939e121
2021-10-06 22:29:28 +00:00
Chen Chen
7efc9b451c Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-qpr-dev 2021-10-06 22:13:37 +00:00
Chen Chen
9a218322e1 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: d9eca4893d am: ca21133410
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: I927aed08ba5175099b0faddacac14664e48155ad
2021-10-06 22:11:29 +00:00
Chen Chen
9e03b75bfa BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: 44deff97de am: b51bfd47db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: Ibdd08a182a053bd651e021daf4a0bc04646a75af
2021-10-06 22:11:23 +00:00
Chen Chen
ca21133410 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: d9eca4893d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: Ice32757d6e80f2cb676ff46021ef63e270cef932
2021-10-06 22:09:51 +00:00
Chen Chen
b51bfd47db BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: 44deff97de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: I8c2438f038db09c9efc185f3dba1932fe9cd621f
2021-10-06 22:01:40 +00:00
Chen Chen
d9eca4893d BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: Id09bebbaef35ec04876284fb378928139a00c20a
2021-10-06 21:50:35 +00:00
Chen Chen
44deff97de BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: I748e0ebed1e2196eb53bbd51b582f816cba86737
2021-10-06 21:50:35 +00:00
Chen Chen
0d70b85832 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: I9479a0307e24a3ebde9f4184fe51fa9075f0f127
2021-10-06 21:41:14 +00:00
Chen Chen
b025b7fa88 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: I5071ab9c43b8882efb51a7eae9f11a2a982f23cb
2021-10-06 21:30:16 +00:00
Chen Chen
d96d13c4f1 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: Icee7ffd9cd3218bb4cd9fcb8fd1c37fc34274507
2021-10-06 21:18:45 +00:00
TreeHugger Robot
7a98b491e9 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 074f18fd8b am: 9f388f2a66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986

Change-Id: I9d17eaf85b6751deff35a980c23597c39bbb839b
2021-10-06 21:17:28 +00:00
TreeHugger Robot
c58143a2a9 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 818a481294 am: 050872ecf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986

Change-Id: Ibf7bfe90906e2da7d9bf9cb4aad4511f5129433a
2021-10-06 21:17:21 +00:00
TreeHugger Robot
9f388f2a66 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 074f18fd8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986

Change-Id: I9ea19580e97599fdbf897755f553a845cc8dee8b
2021-10-06 21:03:46 +00:00