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

Commit 0ad7eb26 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use AttributionSource Builder" into stage-aosp-master am: d34ebacb... 

Merge "Use AttributionSource Builder" into stage-aosp-master am: d34ebacb am: f81f06da am: c786f0e5

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

Change-Id: I24c6ce1d2ec444f75bdcb5e814d0b0c7975ac0a9
parents 17ee7caf c786f0e5

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9981,6 +9981,7 @@ package android.content { 














  public static final class AttributionSource.Builder {















    ctor public AttributionSource.Builder(int);













    ctor public AttributionSource.Builder(@NonNull android.content.AttributionSource);















    method @NonNull public android.content.AttributionSource build();















    method @NonNull public android.content.AttributionSource.Builder setAttributionTag(@Nullable String);















    method @NonNull public android.content.AttributionSource.Builder setNext(@Nullable android.content.AttributionSource);

























core/java/android/bluetooth/BluetoothManager.java



+3
−2




























Original line number
Diff line number
Diff line








@@ -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) {















            }















        }

































core/java/android/content/AttributionSource.java



+12
−0




























Original line number
Diff line number
Diff line








@@ -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.















         */