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

Commit 6e70fedf authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

Merge "Ensure AdapterService and GattService are accessed from... 

Merge "Ensure AdapterService and GattService are accessed from BluetoothManagerService only" into sc-dev am: a834cd64 am: 30bc1e2d

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

Change-Id: I3c55fa43b98898a205c02068d3adf9617d1f2f20
parents c776ab2a 30bc1e2d

AndroidManifest.xml

+4 −2
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ 
        </provider>

        <service android:process="@string/process"

             android:name=".btservice.AdapterService"

             android:exported="true">

             android:exported="true"

             android:permission="android.permission.ACCESS_BLUETOOTH_SHARE">

            <intent-filter>

                <action android:name="android.bluetooth.IBluetooth"/>

            </intent-filter>
@@ -285,7 +286,8 @@ 
        <service android:process="@string/process"

             android:name=".gatt.GattService"

             android:enabled="@bool/profile_supported_gatt"

             android:exported="true">

             android:exported="true"

             android:permission="android.permission.ACCESS_BLUETOOTH_SHARE">

            <intent-filter>

                <action android:name="android.bluetooth.IBluetoothGatt"/>

            </intent-filter>