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

Commit 0e1c1acd authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Pass metadata as AttributionSourceSource." into sc-dev am: a57ee36d am: 6673ce87"

parents 2c04b042 f13ad97a

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ java_defaults { 
        ],

        include_dirs: [

            "frameworks/av/aidl",

            "frameworks/native/libs/permission/aidl",

            "packages/modules/Connectivity/framework/aidl-export",

        ],

    },
@@ -542,6 +543,7 @@ stubs_defaults { 
        ],

        include_dirs: [

            "frameworks/av/aidl",

            "frameworks/native/libs/permission/aidl",

            "packages/modules/Connectivity/framework/aidl-export",

        ],

    },

ApiDocs.bp

+8 −2
Original line number Diff line number Diff line
@@ -113,7 +113,10 @@ stubs_defaults { 
    // TODO(b/169090544): remove below aidl includes.

    aidl: {

        local_include_dirs: ["media/aidl"],

        include_dirs: ["frameworks/av/aidl"],

        include_dirs: [

            "frameworks/av/aidl",

            "frameworks/native/libs/permission/aidl",

        ],

    },

}
@@ -200,7 +203,10 @@ doc_defaults { 
    // TODO(b/169090544): remove below aidl includes.

    aidl: {

        local_include_dirs: ["media/aidl"],

        include_dirs: ["frameworks/av/aidl"],

        include_dirs: [

            "frameworks/av/aidl",

            "frameworks/native/libs/permission/aidl",

        ],

    },

}

core/java/android/permission/IPermissionManager.aidl

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.permission;



import android.content.AttributionSource;

import android.content.AttributionSourceState;

import android.content.pm.ParceledListSlice;

import android.content.pm.PermissionGroupInfo;

import android.content.pm.PermissionInfo;
@@ -87,7 +87,7 @@ interface IPermissionManager { 


    boolean isAutoRevokeExempted(String packageName, int userId);



    void registerAttributionSource(in AttributionSource source);

    void registerAttributionSource(in AttributionSourceState source);



    boolean isRegisteredAttributionSource(in AttributionSource source);

    boolean isRegisteredAttributionSource(in AttributionSourceState source);

}

core/java/android/permission/PermissionManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1177,7 +1177,7 @@ public final class PermissionManager { 
        // enforcement we need to replace the binder with a unique one.

        final AttributionSource registeredSource = source.withToken(new Binder());

        try {

            mPermissionManager.registerAttributionSource(registeredSource);

            mPermissionManager.registerAttributionSource(registeredSource.asState());

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }
@@ -1196,7 +1196,7 @@ public final class PermissionManager { 
     */

    public boolean isRegisteredAttributionSource(@NonNull AttributionSource source) {

        try {

            return mPermissionManager.isRegisteredAttributionSource(source);

            return mPermissionManager.isRegisteredAttributionSource(source.asState());

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+6 −4
Original line number Diff line number Diff line
@@ -3349,13 +3349,15 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
    }



    @Override

    public void registerAttributionSource(@NonNull AttributionSource source) {

        mAttributionSourceRegistry.registerAttributionSource(source);

    public void registerAttributionSource(@NonNull AttributionSourceState source) {

        mAttributionSourceRegistry

                .registerAttributionSource(new AttributionSource(source));

    }



    @Override

    public boolean isRegisteredAttributionSource(@NonNull AttributionSource source) {

        return mAttributionSourceRegistry.isRegisteredAttributionSource(source);

    public boolean isRegisteredAttributionSource(@NonNull AttributionSourceState source) {

        return mAttributionSourceRegistry

                .isRegisteredAttributionSource(new AttributionSource(source));

    }



    @Override