Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4664d0ef authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing... 

Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-v2-dev am: 7d4dd263

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

Change-Id: I3933dda90e3831133d217bcda65c65ea0dc2fd72
parents f06e1039 7d4dd263

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -2238,6 +2238,7 @@ 
        </activity>



        <activity android:name=".bluetooth.BluetoothPairingDialog"

                  android:permission="android.permission.BLUETOOTH_PRIVILEGED"

                  android:excludeFromRecents="true"

                  android:windowSoftInputMode="stateVisible|adjustResize"

                  android:theme="@style/Theme.AlertDialog"