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

Commit aa0ddf01 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove server_side_attribution_registration flag" into main

parents 1b3636a0 115c6e82

core/java/android/permission/PermissionManager.java

+2 −10
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import static android.content.pm.PackageManager.FLAG_PERMISSION_USER_FIXED; 
import static android.content.pm.PackageManager.FLAG_PERMISSION_USER_SET;

import static android.os.Build.VERSION_CODES.S;

import static android.permission.flags.Flags.FLAG_SHOULD_REGISTER_ATTRIBUTION_SOURCE;

import static android.permission.flags.Flags.serverSideAttributionRegistration;



import android.Manifest;

import android.annotation.CheckResult;
@@ -62,7 +61,6 @@ import android.content.pm.PermissionGroupInfo; 
import android.content.pm.PermissionInfo;

import android.content.pm.permission.SplitPermissionInfoParcelable;

import android.media.AudioManager;

import android.os.Binder;

import android.os.Build;

import android.os.Handler;

import android.os.IBinder;
@@ -1632,14 +1630,8 @@ public final class PermissionManager { 
        // only used for process death detection. If we are about to use the source for security

        // enforcement we need to replace the binder with a unique one.

        try {

            if (serverSideAttributionRegistration()) {

            IBinder newToken = mPermissionManager.registerAttributionSource(source.asState());

            return source.withToken(newToken);

            } else {

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

                mPermissionManager.registerAttributionSource(registeredSource.asState());

                return registeredSource;

            }

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }

core/java/android/permission/flags.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -107,13 +107,6 @@ flag { 
    bug: "274132354"

}



flag {

    name: "server_side_attribution_registration"

    namespace: "permissions"

    description: "controls whether the binder representing an AttributionSource is created in the system server, or client process"

    bug: "310953959"

}



flag {

    name: "wallet_role_enabled"

    is_exported: true

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

+4 −11
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import static android.app.AppOpsManager.MODE_IGNORED; 
import static android.app.AppOpsManager.OP_BLUETOOTH_CONNECT;

import static android.content.pm.ApplicationInfo.AUTO_REVOKE_DISALLOWED;

import static android.content.pm.ApplicationInfo.AUTO_REVOKE_DISCOURAGED;

import static android.permission.flags.Flags.serverSideAttributionRegistration;



import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME;
@@ -452,16 +451,10 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
     */

    @Override

    public IBinder registerAttributionSource(@NonNull AttributionSourceState source) {

        if (serverSideAttributionRegistration()) {

        Binder token = new Binder();

        mAttributionSourceRegistry

                .registerAttributionSource(new AttributionSource(source).withToken(token));

        return token;

        } else {

            mAttributionSourceRegistry

                    .registerAttributionSource(new AttributionSource(source));

            return source.token;

        }

    }



    @Override