summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nate Myren <ntmyren@google.com> 2024-03-25 15:01:24 -0700
committer Nate Myren <ntmyren@google.com> 2024-03-25 15:01:24 -0700
commit2c85dd1f70f301619c6988e8544ce1fb14e61225 (patch)
treea75623959943ddc3236316ccc08582d8fb12ccfd
parentdc5c05a05e0536b3f75feded0a65cfb532823498 (diff)
Add isRegisteredAttributionSource to @TestApi
Needed for CTS test. Bug: 331225571 Test: atest AttributionSourceTest Change-Id: I3e56c19a73b9106d4c3da50f40c8213071302b3d
-rw-r--r--core/api/test-current.txt1
-rw-r--r--core/java/android/permission/PermissionManager.java3
2 files changed, 4 insertions, 0 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index a76aa6743bc5..ca70f03e5859 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -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);
}
diff --git a/core/java/android/permission/PermissionManager.java b/core/java/android/permission/PermissionManager.java
index 3c7692d03410..3441244d6c58 100644
--- a/core/java/android/permission/PermissionManager.java
+++ b/core/java/android/permission/PermissionManager.java
@@ -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());