Commit Graph

89175 Commits

Author SHA1 Message Date
TreeHugger Robot
4f27cbc2ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dd3651cc5e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I355bb467c90371c1259f6bafb1df089aa387769b
2021-10-07 08:51:18 +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
dd3651cc5e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-10-07 08:40:55 +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
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
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
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
Chen Chen
25ab32bab1 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407 am: 4f2a6225c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345

Change-Id: I68c7e50dbc5adb8e67026ebedb94741b40e7779c
2021-10-07 00:57:44 +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
25678e730b BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407 am: 579e48b03d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345

Change-Id: Ic8e88d314d355a5e324057a630a2806918f2541d
2021-10-07 00:57:02 +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
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
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
TreeHugger Robot
4664d0efac Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-v2-dev am: 7d4dd26362
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995346

Change-Id: I3933dda90e3831133d217bcda65c65ea0dc2fd72
2021-10-06 22:58:42 +00:00
Xin Li
47a40615ea Merge Android 12
Bug: 202323961
Merged-In: Ib853137811901796f73e4d720accb3249a7db963
Change-Id: I2febbf79bb9858cd6c7a5e1c47bcecbac83398fd
2021-10-06 22:53:58 +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
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
TreeHugger Robot
050872ecf0 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 818a481294
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986

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

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

Change-Id: I4473dbc8e67fe8dd4f3eb574d021062efc1b975e
2021-10-06 20:53:55 +00:00
TreeHugger Robot
1a049e065e Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev 2021-10-06 20:40:57 +00:00
Weng Su
58c97c30ad [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: I3a3a1936a5eea3a70e441bdee58b7afdcdb521dd
2021-10-06 20:14:39 +00:00
Weng Su
0be02f71e5 [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: I90605a50ee49fd9813e850371468a8b21dbbb1e2
2021-10-06 20:14:38 +00:00
Weng Su
26af79c34c [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: Ibac06f82f8cbb311c8c46cda23f04451979a35ed
2021-10-06 20:14:37 +00:00
Weng Su
17eb3f2447 [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: I0d236768745dba36cd148a204c7fd2c4e4f12bf7
2021-10-06 20:14:33 +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