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

Commit 34319830 authored by Nate Myren's avatar Nate Myren Committed by Android (Google) Code Review
Browse files

Merge "Add isRegisteredAttributionSource to @TestApi" into main

parents ef1b9144 2c85dd1f

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2769,6 +2769,7 @@ package android.permission { 
  public final class PermissionManager {

    method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.permission.PermissionGroupUsage> getIndicatorAppOpUsageData();

    method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.permission.PermissionGroupUsage> getIndicatorAppOpUsageData(boolean);

    method @FlaggedApi("android.permission.flags.should_register_attribution_source") public boolean isRegisteredAttributionSource(@NonNull android.content.AttributionSource);

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

    method @RequiresPermission(android.Manifest.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL) public void revokePostNotificationPermissionWithoutKillForTest(@NonNull String, int);

  }

core/java/android/permission/PermissionManager.java

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.content.pm.PackageManager.FLAG_PERMISSION_SYSTEM_FIXED; 
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;
@@ -1652,6 +1653,8 @@ public final class PermissionManager { 
     *

     * @hide

     */

    @TestApi

    @FlaggedApi(FLAG_SHOULD_REGISTER_ATTRIBUTION_SOURCE)

    public boolean isRegisteredAttributionSource(@NonNull AttributionSource source) {

        try {

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