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

Commit 51804852 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge "Preserve legacy permission check behavior." into sc-dev am: 8d1d972856 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14338278

Change-Id: I5b462dedd199fc3af79028b8f1e4c2798ab30b5d
parents c1421df6 19a8d096

framework/java/android/bluetooth/BluetoothHeadset.java

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.compat.annotation.UnsupportedAppUsage; 
import android.content.AttributionSource;

import android.content.ComponentName;

import android.content.Context;

import android.content.pm.PackageManager;

import android.os.Binder;

import android.os.Build;

import android.os.Handler;
@@ -365,6 +366,15 @@ public final class BluetoothHeadset implements BluetoothProfile { 
        mAdapter = adapter;

        mAttributionSource = adapter.getAttributionSource();



        // Preserve legacy compatibility where apps were depending on

        // registerStateChangeCallback() performing a permissions check which

        // has been relaxed in modern platform versions

        if (context.getApplicationInfo().targetSdkVersion <= Build.VERSION_CODES.R

                && context.checkSelfPermission(android.Manifest.permission.BLUETOOTH)

                        != PackageManager.PERMISSION_GRANTED) {

            throw new SecurityException("Need BLUETOOTH permission");

        }



        IBluetoothManager mgr = mAdapter.getBluetoothManager();

        if (mgr != null) {

            try {

framework/java/android/bluetooth/BluetoothPbap.java

+11 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.Intent;

import android.content.ServiceConnection;

import android.content.pm.PackageManager;

import android.os.Build;

import android.os.IBinder;

import android.os.RemoteException;
@@ -136,6 +137,16 @@ public class BluetoothPbap implements BluetoothProfile { 
        mServiceListener = l;

        mAdapter = adapter;

        mAttributionSource = adapter.getAttributionSource();



        // Preserve legacy compatibility where apps were depending on

        // registerStateChangeCallback() performing a permissions check which

        // has been relaxed in modern platform versions

        if (context.getApplicationInfo().targetSdkVersion <= Build.VERSION_CODES.R

                && context.checkSelfPermission(android.Manifest.permission.BLUETOOTH)

                        != PackageManager.PERMISSION_GRANTED) {

            throw new SecurityException("Need BLUETOOTH permission");

        }



        IBluetoothManager mgr = mAdapter.getBluetoothManager();

        if (mgr != null) {

            try {

framework/java/android/bluetooth/BluetoothProfileConnector.java

+12 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.Intent;

import android.content.ServiceConnection;

import android.content.pm.PackageManager;

import android.os.Build;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.UserHandle;
@@ -123,6 +125,16 @@ public abstract class BluetoothProfileConnector<T> { 
        mContext = context;

        mServiceListener = listener;

        IBluetoothManager mgr = BluetoothAdapter.getDefaultAdapter().getBluetoothManager();



        // Preserve legacy compatibility where apps were depending on

        // registerStateChangeCallback() performing a permissions check which

        // has been relaxed in modern platform versions

        if (context.getApplicationInfo().targetSdkVersion <= Build.VERSION_CODES.R

                && context.checkSelfPermission(android.Manifest.permission.BLUETOOTH)

                        != PackageManager.PERMISSION_GRANTED) {

            throw new SecurityException("Need BLUETOOTH permission");

        }



        if (mgr != null) {

            try {

                mgr.registerStateChangeCallback(mBluetoothStateChangeCallback);