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

Commit e7282659 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Fix the @RequiresPermission annotation." into tm-dev am: 83383957 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17698251



Change-Id: If885c18d6af186f22e9f51f599ebf7e55de144a5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e177ad5 83383957

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ package android.app { 
    method public void clearRequireCompatChange();

    method public boolean isPendingIntentBackgroundActivityLaunchAllowed();

    method public static android.app.BroadcastOptions makeBasic();

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void recordResponseEventWhileInBackground(@IntRange(from=0) long);

    method @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RESPONSE_STATS) public void recordResponseEventWhileInBackground(@IntRange(from=0) long);

    method @RequiresPermission(android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND) public void setBackgroundActivityStartsAllowed(boolean);

    method public void setDontSendToRestrictedApps(boolean);

    method public void setPendingIntentBackgroundActivityLaunchAllowed(boolean);

core/java/android/app/BroadcastOptions.java

+1 −1
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ public class BroadcastOptions extends ComponentOptions { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS)

    @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RESPONSE_STATS)

    public void recordResponseEventWhileInBackground(@IntRange(from = 0) long id) {

        mIdForResponseEvent = id;

    }