Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add conditional=true for @RequiresPermission"

Browse Source
This commit is contained in:
Xiaoyu Jin
2021-12-08 00:47:34 +00:00
committed by Android (Google) Code Review
parent 06b0e230a4 a645deab92
commit 72beecddc1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/module-lib-current.txt
View File

@@ -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 {

3
core/java/android/content/ContentResolver.java
View File

@@ -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,