diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2021-04-29 22:22:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-04-29 22:22:25 +0000 |
| commit | cfb0ad04a3ad8c15e37ab7cdb58e014c41b3eed6 (patch) | |
| tree | 7c38ffdedb3938e2b8282e544060564bab1591f6 /framework/java/android/bluetooth/le/AdvertisingSet.java | |
| parent | 308948fd95f2611dd6d448d1103d44c3f70823d5 (diff) | |
| parent | a2d365484c43a19ab6f67152651d61f3b0667b47 (diff) | |
Merge "Ensure privileged APIs require runtime permission." into sc-dev
Diffstat (limited to 'framework/java/android/bluetooth/le/AdvertisingSet.java')
| -rw-r--r-- | framework/java/android/bluetooth/le/AdvertisingSet.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/le/AdvertisingSet.java b/framework/java/android/bluetooth/le/AdvertisingSet.java index caa91fb239..bbdb6953af 100644 --- a/framework/java/android/bluetooth/le/AdvertisingSet.java +++ b/framework/java/android/bluetooth/le/AdvertisingSet.java @@ -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); } |