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

Commit 72beecdd authored by Xiaoyu Jin's avatar Xiaoyu Jin Committed by Android (Google) Code Review
Browse files

Merge "Add conditional=true for @RequiresPermission"

parents 06b0e230 a645deab

core/api/module-lib-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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 {

core/java/android/content/ContentResolver.java

+2 −1
Original line number Diff line number Diff line
@@ -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,