PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,333 Commits 1 Branch 0 Tags
c5230ce87ef4be75d881f4894e6beeb1b6a04e30
Commit Graph

89333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
815abaade4 Merge "[Large screen] Set alwaysExpand for SearchActivity." into sc-v2-dev am: bf6160280f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15921663

Change-Id: I92af54854cc20dc8835a9a650d63b018c68692f0
 2021-10-08 12:07:10 +00:00
TreeHugger Robot
bf6160280f Merge "[Large screen] Set alwaysExpand for SearchActivity." into sc-v2-dev 2021-10-08 11:58:29 +00:00
TreeHugger Robot
fdb46441a9 Merge "Change DeepLinkHomepageActivity enable state for ACTION_USER_INITIALIZE" into sc-v2-dev am: 1bc9997032 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16013678

Change-Id: I4882850212e0936f262f883ab82ee22c91f171ce
 2021-10-08 11:31:18 +00:00
TreeHugger Robot
1bc9997032 Merge "Change DeepLinkHomepageActivity enable state for ACTION_USER_INITIALIZE" into sc-v2-dev 2021-10-08 11:11:20 +00:00
Arc Wang
28cdf73cf7 [Large screen] Set alwaysExpand for SearchActivity. 
Set alwaysExpand and SearchActivity will show in full screen.

Bug: 196923591
Test: manual
      Settings -> Search settings
Change-Id: I4174753bce15232342fa69d0845225a95d757782
 2021-10-08 18:14:18 +08:00
Xin Li
3f6535f1f0 [automerger skipped] Merge "Merge Android 12" am: 433825250d -s ours am: 7062f8326d -s ours am: b2fadd3b8a -s ours am: f6ff784305 -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: I2fde09fc444eaf6e6dc503d5013ad12c5ffc2494
 2021-10-08 08:29:47 +00:00
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
Jason Chiu
de33f1224b Merge "Support highlightable Settings homepage menu for 2-pane" into sc-v2-dev am: 9b1f593773 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785736

Change-Id: I541605e02d5afdc340faf28c69ecc4b66207ed86
 2021-10-08 08:04:48 +00:00
Xin Li
f6ff784305 [automerger skipped] Merge "Merge Android 12" am: 433825250d -s ours am: 7062f8326d -s ours am: b2fadd3b8a -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: I2034dc23c36bb8565dc8a0e4775da3851631004e
 2021-10-08 07:56:49 +00:00
TreeHugger Robot
1ac47f4115 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469 -s ours am: 824f21616b -s ours am: 34ab8e7060 -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: I94be767dcfccf94b0a7782b49b11376c0080e107
 2021-10-08 07:53:34 +00:00
TreeHugger Robot
68c6cbf627 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: 07fe34aa57 am: f5e2d0dcb3 am: 445ea21c1e am: 5bf33443db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

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

Change-Id: I2480e9be5972b7cd656688ef0a841e5630aad27d
 2021-10-08 07:53:21 +00:00
TreeHugger Robot
8d7347dc25 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev am: df95750605 am: 4f63f0c9e1 am: 75fe45f4b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15987304

Change-Id: Ib4880d69333e47fbd16715ec01fcf9ce4463adf1
 2021-10-08 07:53:12 +00:00
Chen Chen
0ecee0e720 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-qpr-dev am: 7efc9b451c am: 3449eccd85 am: d67647327d am: b8e5201104 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995587

Change-Id: I08388d47bba977d13dfe7d4695609716b8e7ec6d
 2021-10-08 07:53:06 +00:00
Chen Chen
68ab2e4180 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: d9eca4893d am: ca21133410 am: 9a218322e1 am: 62d0525a24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: I68491efad5310af07c5ae7de36b93574c7b303fc
 2021-10-08 07:53:00 +00:00
Chen Chen
dded8a5a16 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: aebca7f35b am: d96d13c4f1 am: b025b7fa88 am: 0d70b85832 am: 44deff97de am: b51bfd47db am: 9e03b75bfa am: 32d9500f39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994984

Change-Id: I98970c28a6c1d9972e7b80d7f7ed61d01f8abfd3
 2021-10-08 07:52:51 +00:00
Jason Chiu
9b1f593773 Merge "Support highlightable Settings homepage menu for 2-pane" into sc-v2-dev 2021-10-08 07:52:45 +00:00
TreeHugger Robot
9314bb316b Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 074f18fd8b am: 9f388f2a66 am: 7a98b491e9 am: d91faea117 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986

Change-Id: I26d79032a2c11465656f2b5d265e7a00e44a9e4d
 2021-10-08 07:52:42 +00:00
TreeHugger Robot
b49ea1f6d1 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 818a481294 am: 050872ecf0 am: c58143a2a9 am: 4f9cdf9df7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986

Change-Id: Ie0e7ebe2dcf329dc5e0135afc0fa3f2c20a3c68c
 2021-10-08 07:52:34 +00:00
Weng Su
e14c913dcb [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 skip reason: subject contains skip directive

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

Change-Id: I64dc76a05bc3a5e39047fe2367fe78253ea13794
 2021-10-08 07:52:26 +00:00
Weng Su
fb2b0f5e4b [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 skip reason: subject contains skip directive

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

Change-Id: I91255de0d89d269289b030b6f0e18e7561a5dc56
 2021-10-08 07:52:25 +00:00
Weng Su
a10c40867c [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 skip reason: subject contains skip directive

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

Change-Id: I61a0fbd752efacd5fdaa2a5c9631e516ea055f9c
 2021-10-08 07:52:24 +00:00
Weng Su
2242a139b7 [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 skip reason: subject contains skip directive

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

Change-Id: I93207071b6773a1ccb9dc820929ddec85e5d6286
 2021-10-08 07:52:24 +00:00
Weng Su
2f81acda9b [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 skip reason: subject contains skip directive

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

Change-Id: I1875732fd2e668275743e2292e27327e18ca4edc
 2021-10-08 07:52:09 +00:00
Weng Su
d66f679a1c [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 skip reason: subject contains skip directive

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

Change-Id: I56f1a4c2e6156dabef7d1487b10e174c44e66b30
 2021-10-08 07:52:08 +00:00
Weng Su
3a3b3c27dc [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 skip reason: subject contains skip directive

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

Change-Id: Idae8c0ab14219d2f8d96f00f576bccf04284772f
 2021-10-08 07:52:08 +00:00
Weng Su
1b5a993750 [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 skip reason: subject contains skip directive

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

Change-Id: I369ab8a586bb544c45c359ba915a61e83b24e581
 2021-10-08 07:52:07 +00:00
Automerger Merge Worker
9ae5da0ee5 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 2021-10-08 07:51:56 +00:00
Weng Su
d9ff2b5b3f [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 skip reason: subject contains skip directive

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

Change-Id: Ia9d81deffac36c6b2bcab16fdb8c4708b224f5f7
 2021-10-08 07:51:54 +00:00
TreeHugger Robot
17e60a695f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469 -s ours am: 9048523ba4 -s ours am: df1a21033f -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: Id0f52f403214a74c0a7037cae0bc702e83caf1ba
 2021-10-08 07:51:53 +00:00
Weng Su
7836d976d8 [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 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: Iac7e4b9a741ef2d5152fac7161c78b46586825a6
 2021-10-08 07:51:53 +00:00
TreeHugger Robot
4210a7bcae 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: I8b0f587555cd772c2c40ff34dc1f2d6977f47267
 2021-10-08 07:51:49 +00:00
Weng Su
e4d6c530c5 [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 skip reason: subject contains skip directive

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

Change-Id: Iaeb9e5d0c3f2b25e46ebe451e7973b5e649f78ef
 2021-10-08 07:51:46 +00:00
Weng Su
26ed60de74 [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 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: I00fd03899e6c39f0884f1fff19c852c5ab4807f5
 2021-10-08 07:51:46 +00:00
Automerger Merge Worker
0030a44068 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 2021-10-08 07:51:42 +00:00
TreeHugger Robot
497364818f 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: Ia700d311a395a94a133961863a1643621ce0b2cb
 2021-10-08 07:51:39 +00:00
Weng Su
b2cb8a744d [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d am: 1b732ee4cb am: 3d77db28a7 -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: I3a464453d9a732ea717e6db1ba3998342e3c7836
 2021-10-08 07:51:38 +00:00
Weng Su
2d82ebf7ec [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 am: 36558d2c6c -s ours am: c95ed2d0b3 -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: I6c1fdcb67fdf082ffc5ebddfb6fa2ee1a024da9d
 2021-10-08 07:51:38 +00:00
Weng Su
9d340d1d94 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b am: 372e90064b am: d243cc3d48 -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: I163aaa857e933fdea664e3e784744580a0be51c7
 2021-10-08 07:51:36 +00:00
Automerger Merge Worker
83df22cc79 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 2021-10-08 07:51:33 +00:00
TreeHugger Robot
6f4bec749d [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 skip reason: subject contains skip directive

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

Change-Id: I18b3ed4b5f55add9b53022561d9a1482fe0a67ea
 2021-10-08 07:51:31 +00:00
TreeHugger Robot
132f6edef1 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev am: df95750605 am: aeb6c685e1 am: 08aba4bb74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15987304

Change-Id: I1f1b77a89ffc5f500ef0dd33c5d2aa8612eea0e9
 2021-10-08 07:51:29 +00:00
TreeHugger Robot
625e1d612b 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

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

Change-Id: I83a6c3bd78b0c26261b03dfd344f755544aa62ea
 2021-10-08 07:51:24 +00:00
Automerger Merge Worker
f45b3f570b 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 2021-10-08 07:51:21 +00:00
TreeHugger Robot
7ec8334b07 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

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

Change-Id: Ice17afccb6b2b7b73578df49988bd256548234f1
 2021-10-08 07:51:17 +00:00
Automerger Merge Worker
7c53f6e464 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 2021-10-08 07:51:13 +00:00
TreeHugger Robot
54875ccaf4 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev am: df95750605 am: aeb6c685e1 am: af77052fbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15987304

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

Change-Id: Ief58bdf36482c519fc335f176a815f8ad1da1582
 2021-10-08 07:51:09 +00:00