diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothManager.java | 5 | ||||
| -rw-r--r-- | core/java/android/content/AttributionSource.java | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothManager.java b/core/java/android/bluetooth/BluetoothManager.java index c21362cd89f9..20152f3d2471 100644 --- a/core/java/android/bluetooth/BluetoothManager.java +++ b/core/java/android/bluetooth/BluetoothManager.java @@ -88,8 +88,9 @@ public final class BluetoothManager { uid = android.os.Process.SYSTEM_UID; } try { - res = new AttributionSource(uid, - AppGlobals.getPackageManager().getPackagesForUid(uid)[0], null); + res = new AttributionSource.Builder(uid) + .setPackageName(AppGlobals.getPackageManager().getPackagesForUid(uid)[0]) + .build(); } catch (RemoteException ignored) { } } diff --git a/core/java/android/content/AttributionSource.java b/core/java/android/content/AttributionSource.java index bdb7900b5bb9..6ae2bb5b642a 100644 --- a/core/java/android/content/AttributionSource.java +++ b/core/java/android/content/AttributionSource.java @@ -474,6 +474,18 @@ public final class AttributionSource implements Parcelable { mAttributionSourceState.uid = uid; } + public Builder(@NonNull AttributionSource current) { + if (current == null) { + throw new IllegalArgumentException("current AttributionSource can not be null"); + } + mAttributionSourceState.uid = current.getUid(); + mAttributionSourceState.packageName = current.getPackageName(); + mAttributionSourceState.attributionTag = current.getAttributionTag(); + mAttributionSourceState.token = current.getToken(); + mAttributionSourceState.renouncedPermissions = + current.mAttributionSourceState.renouncedPermissions; + } + /** * The package that is accessing the permission protected data. */ |