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

Commit 9a9fa815 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Ensure privileged APIs require runtime permission." into sc-dev

parents 7cdf7123 b8e4b883

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -9035,7 +9035,7 @@ package android.bluetooth { 
    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getType();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.os.ParcelUuid[] getUuids();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean setAlias(@NonNull String);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setPairingConfirmation(boolean);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setPairingConfirmation(boolean);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean setPin(byte[]);

    method public void writeToParcel(android.os.Parcel, int);

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_ACL_CONNECTED = "android.bluetooth.device.action.ACL_CONNECTED";

core/api/system-current.txt

+12 −12
Original line number Diff line number Diff line
@@ -1930,16 +1930,16 @@ package android.bluetooth { 
  }















  public final class BluetoothAdapter {













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean addOnMetadataChangedListener(@NonNull android.bluetooth.BluetoothDevice, @NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothAdapter.OnMetadataChangedListener);













    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean addOnMetadataChangedListener(@NonNull android.bluetooth.BluetoothDevice, @NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothAdapter.OnMetadataChangedListener);















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean disableBLE();















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean enableBLE();















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean enableNoAutoConnect();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public void generateLocalOobData(int, @NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothAdapter.OobDataCallback);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public long getDiscoveryEndMillis();













    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void generateLocalOobData(int, @NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothAdapter.OobDataCallback);













    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public long getDiscoveryEndMillis();















    method public boolean isBleScanAlwaysAvailable();















    method public boolean isLeEnabled();















    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean removeActiveDevice(int);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean removeOnMetadataChangedListener(@NonNull android.bluetooth.BluetoothDevice, @NonNull android.bluetooth.BluetoothAdapter.OnMetadataChangedListener);













    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean removeOnMetadataChangedListener(@NonNull android.bluetooth.BluetoothDevice, @NonNull android.bluetooth.BluetoothAdapter.OnMetadataChangedListener);















    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean setActiveDevice(@NonNull android.bluetooth.BluetoothDevice, int);















    field public static final String ACTION_BLE_STATE_CHANGED = "android.bluetooth.adapter.action.BLE_STATE_CHANGED";















    field public static final String ACTION_REQUEST_BLE_SCAN_ALWAYS_AVAILABLE = "android.bluetooth.adapter.action.REQUEST_BLE_SCAN_ALWAYS_AVAILABLE";









@@ -1961,20 +1961,20 @@ package android.bluetooth {













  }





























  public final class BluetoothDevice implements android.os.Parcelable {













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean canBondWithoutDialog();













    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean canBondWithoutDialog();















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean cancelBondProcess();















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean createBondOutOfBand(int, @Nullable android.bluetooth.OobData, @Nullable android.bluetooth.OobData);













    method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public byte[] getMetadata(int);













    method @Nullable @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public byte[] getMetadata(int);















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getSimAccessPermission();















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean isConnected();















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean isEncrypted();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean isInSilenceMode();













    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean isInSilenceMode();















    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean removeBond();













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setMessageAccessPermission(int);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setMetadata(int, @NonNull byte[]);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setPhonebookAccessPermission(int);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setSilenceMode(boolean);













    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setSimAccessPermission(int);













    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setMessageAccessPermission(int);













    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setMetadata(int, @NonNull byte[]);













    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setPhonebookAccessPermission(int);













    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setSilenceMode(boolean);













    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setSimAccessPermission(int);















    field public static final int ACCESS_ALLOWED = 1; // 0x1















    field public static final int ACCESS_REJECTED = 2; // 0x2















    field public static final int ACCESS_UNKNOWN = 0; // 0x0

























core/java/android/bluetooth/BluetoothAdapter.java



+79
−25




























Original line number
Diff line number
Diff line








@@ -1311,11 +1311,15 @@ public final class BluetoothAdapter {













     * @hide















     */















    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)













    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)













    @RequiresBluetoothConnectPermission













    @RequiresPermission(allOf = {













            android.Manifest.permission.BLUETOOTH_CONNECT,













            android.Manifest.permission.BLUETOOTH_PRIVILEGED,













    })















    public boolean factoryReset() {















        try {















            mServiceLock.readLock().lock();













            if (mService != null && mService.factoryReset()













            if (mService != null && mService.factoryReset(mAttributionSource)















                    && mManagerService != null















                    && mManagerService.onFactoryReset(mAttributionSource)) {















                return true;










@@ -1430,7 +1434,11 @@ public final class BluetoothAdapter {













     *















     * @hide















     */













    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)













    @RequiresBluetoothConnectPermission













    @RequiresPermission(allOf = {













            android.Manifest.permission.BLUETOOTH_CONNECT,













            android.Manifest.permission.BLUETOOTH_PRIVILEGED,













    })















    public boolean setBluetoothClass(BluetoothClass bluetoothClass) {















        if (getState() != STATE_ON) {















            return false;









@@ -1438,7 +1446,7 @@ public final class BluetoothAdapter {













        try {















            mServiceLock.readLock().lock();















            if (mService != null) {













                return mService.setBluetoothClass(bluetoothClass);













                return mService.setBluetoothClass(bluetoothClass, mAttributionSource);















            }















        } catch (RemoteException e) {















            Log.e(TAG, "", e);










@@ -1487,12 +1495,16 @@ public final class BluetoothAdapter {













     *















     * @hide















     */













    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)













    @RequiresBluetoothConnectPermission













    @RequiresPermission(allOf = {













            android.Manifest.permission.BLUETOOTH_CONNECT,













            android.Manifest.permission.BLUETOOTH_PRIVILEGED,













    })















    public boolean setIoCapability(@IoCapability int capability) {















        if (getState() != STATE_ON) return false;















        try {















            mServiceLock.readLock().lock();













            if (mService != null) return mService.setIoCapability(capability);













            if (mService != null) return mService.setIoCapability(capability, mAttributionSource);















        } catch (RemoteException e) {















            Log.e(TAG, e.getMessage(), e);















        } finally {










@@ -1540,12 +1552,16 @@ public final class BluetoothAdapter {













     *















     * @hide















     */













    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)













    @RequiresBluetoothConnectPermission













    @RequiresPermission(allOf = {













            android.Manifest.permission.BLUETOOTH_CONNECT,













            android.Manifest.permission.BLUETOOTH_PRIVILEGED,













    })















    public boolean setLeIoCapability(@IoCapability int capability) {















        if (getState() != STATE_ON) return false;















        try {















            mServiceLock.readLock().lock();













            if (mService != null) return mService.setLeIoCapability(capability);













            if (mService != null) return mService.setLeIoCapability(capability, mAttributionSource);















        } catch (RemoteException e) {















            Log.e(TAG, e.getMessage(), e);















        } finally {










@@ -1739,12 +1755,16 @@ public final class BluetoothAdapter {













     * @hide















     */















    @SystemApi













    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)













    @RequiresBluetoothConnectPermission













    @RequiresPermission(allOf = {













            android.Manifest.permission.BLUETOOTH_CONNECT,













            android.Manifest.permission.BLUETOOTH_PRIVILEGED,













    })















    public long getDiscoveryEndMillis() {















        try {















            mServiceLock.readLock().lock();















            if (mService != null) {













                return mService.getDiscoveryEndMillis();













                return mService.getDiscoveryEndMillis(mAttributionSource);















            }















        } catch (RemoteException e) {















            Log.e(TAG, "", e);










@@ -2353,7 +2373,11 @@ public final class BluetoothAdapter {













     * instead.















     */















    @Deprecated













    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)













    @RequiresBluetoothConnectPermission













    @RequiresPermission(allOf = {













            android.Manifest.permission.BLUETOOTH_CONNECT,













            android.Manifest.permission.BLUETOOTH_PRIVILEGED,













    })















    public BluetoothActivityEnergyInfo getControllerActivityEnergyInfo(int updateType) {















        SynchronousResultReceiver receiver = new SynchronousResultReceiver();















        requestControllerActivityEnergyInfo(receiver);









@@ -2379,12 +2403,16 @@ public final class BluetoothAdapter {













     * @param result The callback to which to send the activity info.















     * @hide















     */













    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)













    @RequiresBluetoothConnectPermission













    @RequiresPermission(allOf = {













            android.Manifest.permission.BLUETOOTH_CONNECT,













            android.Manifest.permission.BLUETOOTH_PRIVILEGED,













    })















    public void requestControllerActivityEnergyInfo(ResultReceiver result) {















        try {















            mServiceLock.readLock().lock();















            if (mService != null) {













                mService.requestActivityInfo(result);













                mService.requestActivityInfo(result, mAttributionSource);















                result = null;















            }















        } catch (RemoteException e) {










@@ -3141,7 +3169,7 @@ public final class BluetoothAdapter {













                        sMetadataListeners.forEach((device, pair) -> {















                            try {















                                mService.registerMetadataListener(sBluetoothMetadataListener,













                                        device);













                                        device, mAttributionSource);















                            } catch (RemoteException e) {















                                Log.e(TAG, "Failed to register metadata listener", e);















                            }









@@ -3150,7 +3178,8 @@ public final class BluetoothAdapter {













                    synchronized (mBluetoothConnectionCallbackExecutorMap) {















                        if (!mBluetoothConnectionCallbackExecutorMap.isEmpty()) {















                            try {













                                mService.registerBluetoothConnectionCallback(mConnectionCallback);













                                mService.registerBluetoothConnectionCallback(mConnectionCallback,













                                        mAttributionSource);















                            } catch (RemoteException e) {















                                Log.e(TAG, "onBluetoothServiceUp: Failed to register bluetooth"















                                        + "connection callback", e);










@@ -3364,7 +3393,11 @@ public final class BluetoothAdapter {













     * @hide















     */















    @SystemApi













    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)













    @RequiresBluetoothConnectPermission













    @RequiresPermission(allOf = {













            android.Manifest.permission.BLUETOOTH_CONNECT,













            android.Manifest.permission.BLUETOOTH_PRIVILEGED,













    })















    public void generateLocalOobData(@Transport int transport,















            @NonNull @CallbackExecutor Executor executor, @NonNull OobDataCallback callback) {















        if (transport != BluetoothDevice.TRANSPORT_BREDR && transport









@@ -3378,7 +3411,7 @@ public final class BluetoothAdapter {













        } else {















            try {















                mService.generateLocalOobData(transport, new WrappedOobDataCallback(callback,













                        executor));













                        executor), mAttributionSource);















            } catch (RemoteException e) {















                Log.e(TAG, "", e);















            }










@@ -3515,11 +3548,13 @@ public final class BluetoothAdapter {





























    /** {@hide} */















    @UnsupportedAppUsage













    @RequiresNoPermission















    public IBluetoothManager getBluetoothManager() {















        return mManagerService;















    }































    /** {@hide} */













    @RequiresNoPermission















    public AttributionSource getAttributionSource() {















        return mAttributionSource;















    }










@@ -3892,7 +3927,11 @@ public final class BluetoothAdapter {













     * @hide















     */















    @SystemApi













    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)













    @RequiresBluetoothConnectPermission













    @RequiresPermission(allOf = {













            android.Manifest.permission.BLUETOOTH_CONNECT,













            android.Manifest.permission.BLUETOOTH_PRIVILEGED,













    })















    public boolean addOnMetadataChangedListener(@NonNull BluetoothDevice device,















            @NonNull Executor executor, @NonNull OnMetadataChangedListener listener) {















        if (DBG) Log.d(TAG, "addOnMetadataChangedListener()");










@@ -3932,7 +3971,8 @@ public final class BluetoothAdapter {





























            boolean ret = false;















            try {













                ret = service.registerMetadataListener(sBluetoothMetadataListener, device);













                ret = service.registerMetadataListener(sBluetoothMetadataListener, device,













                        mAttributionSource);















            } catch (RemoteException e) {















                Log.e(TAG, "registerMetadataListener fail", e);















            } finally {










@@ -3965,7 +4005,11 @@ public final class BluetoothAdapter {













     * @hide















     */















    @SystemApi













    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)













    @RequiresBluetoothConnectPermission













    @RequiresPermission(allOf = {













            android.Manifest.permission.BLUETOOTH_CONNECT,













            android.Manifest.permission.BLUETOOTH_PRIVILEGED,













    })















    public boolean removeOnMetadataChangedListener(@NonNull BluetoothDevice device,















            @NonNull OnMetadataChangedListener listener) {















        if (DBG) Log.d(TAG, "removeOnMetadataChangedListener()");










@@ -3993,7 +4037,7 @@ public final class BluetoothAdapter {













                    return true;















                }















                try {













                    return service.unregisterMetadataListener(device);













                    return service.unregisterMetadataListener(device, mAttributionSource);















                } catch (RemoteException e) {















                    Log.e(TAG, "unregisterMetadataListener fail", e);















                    return false;










@@ -4055,7 +4099,11 @@ public final class BluetoothAdapter {













     * @throws IllegalArgumentException if the callback is already registered















     * @hide















     */













    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)













    @RequiresBluetoothConnectPermission













    @RequiresPermission(allOf = {













            android.Manifest.permission.BLUETOOTH_CONNECT,













            android.Manifest.permission.BLUETOOTH_PRIVILEGED,













    })















    public boolean registerBluetoothConnectionCallback(@NonNull @CallbackExecutor Executor executor,















            @NonNull BluetoothConnectionCallback callback) {















        if (DBG) Log.d(TAG, "registerBluetoothConnectionCallback()");









@@ -4069,7 +4117,8 @@ public final class BluetoothAdapter {













                try {















                    mServiceLock.readLock().lock();















                    if (mService != null) {













                        if (!mService.registerBluetoothConnectionCallback(mConnectionCallback)) {













                        if (!mService.registerBluetoothConnectionCallback(mConnectionCallback,













                                mAttributionSource)) {















                            return false;















                        }















                    }










@@ -4098,7 +4147,11 @@ public final class BluetoothAdapter {













     * @return true if the callback was unregistered successfully, false otherwise















     * @hide















     */













    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)













    @RequiresBluetoothConnectPermission













    @RequiresPermission(allOf = {













            android.Manifest.permission.BLUETOOTH_CONNECT,













            android.Manifest.permission.BLUETOOTH_PRIVILEGED,













    })















    public boolean unregisterBluetoothConnectionCallback(















            @NonNull BluetoothConnectionCallback callback) {















        if (DBG) Log.d(TAG, "unregisterBluetoothConnectionCallback()");









@@ -4120,7 +4173,8 @@ public final class BluetoothAdapter {













        try {















            mServiceLock.readLock().lock();















            if (mService != null) {













                return mService.unregisterBluetoothConnectionCallback(mConnectionCallback);













                return mService.unregisterBluetoothConnectionCallback(mConnectionCallback,













                        mAttributionSource);















            }















        } catch (RemoteException e) {















            Log.e(TAG, "", e);

































core/java/android/bluetooth/BluetoothDevice.java



+45
−18


























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/bluetooth/le/AdvertisingSet.java



+6
−2




























Original line number
Diff line number
Diff line








@@ -205,10 +205,14 @@ public final class AdvertisingSet {













     *















     * @hide















     */













    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)













    @RequiresBluetoothAdvertisePermission













    @RequiresPermission(allOf = {













            android.Manifest.permission.BLUETOOTH_ADVERTISE,













            android.Manifest.permission.BLUETOOTH_PRIVILEGED,













    })















    public void getOwnAddress() {















        try {













            mGatt.getOwnAddress(mAdvertiserId);













            mGatt.getOwnAddress(mAdvertiserId, mAttributionSource);















        } catch (RemoteException e) {















            Log.e(TAG, "remote exception - ", e);















        }