From a645deab9229b7fba139254e8df655cb6d3c5218 Mon Sep 17 00:00:00 2001 From: Xiaoyu Jin Date: Tue, 7 Dec 2021 08:21:12 +0000 Subject: [PATCH] Add conditional=true for @RequiresPermission Bug: 206743591 Test: CtsContentTestCases Change-Id: Iec1a4e773e6f625da9aac03cd7b71d47a251b84f --- core/api/module-lib-current.txt | 2 +- core/java/android/content/ContentResolver.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 0bbc80c55af62..b8ce02e725719 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -79,7 +79,7 @@ package android.content { } public abstract class ContentResolver { - method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public final void registerContentObserverAsUser(@NonNull android.net.Uri, boolean, @NonNull android.database.ContentObserver, @NonNull android.os.UserHandle); + method @RequiresPermission(value=android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional=true) public final void registerContentObserverAsUser(@NonNull android.net.Uri, boolean, @NonNull android.database.ContentObserver, @NonNull android.os.UserHandle); } public abstract class Context { diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index adae5996372a5..184acb1a81ef5 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -2684,7 +2684,8 @@ public abstract class ContentResolver implements ContentInterface { * @hide * @see #unregisterContentObserver */ - @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) + @RequiresPermission(value = android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, + conditional = true) @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public final void registerContentObserverAsUser(@NonNull Uri uri, boolean notifyForDescendants,