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

Commit beb04fb4 authored by Mark Cwalinski's avatar Mark Cwalinski Committed by Android (Google) Code Review
Browse files

Merge "Add @RequiresPermission annotation to setFullScreenIntent to match documentation." into main

parents 4031a2df f12026d9

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6701,7 +6701,7 @@ package android.app { 
    method @NonNull public android.app.Notification.Builder setExtras(android.os.Bundle);

    method @NonNull public android.app.Notification.Builder setFlag(int, boolean);

    method @NonNull public android.app.Notification.Builder setForegroundServiceBehavior(int);

    method @NonNull public android.app.Notification.Builder setFullScreenIntent(android.app.PendingIntent, boolean);

    method @NonNull @RequiresPermission(android.Manifest.permission.USE_FULL_SCREEN_INTENT) public android.app.Notification.Builder setFullScreenIntent(android.app.PendingIntent, boolean);

    method @NonNull public android.app.Notification.Builder setGroup(String);

    method @NonNull public android.app.Notification.Builder setGroupAlertBehavior(int);

    method @NonNull public android.app.Notification.Builder setGroupSummary(boolean);

core/java/android/app/Notification.java

+1 −0
Original line number Diff line number Diff line
@@ -5058,6 +5058,7 @@ public class Notification implements Parcelable 
         * @see Notification#fullScreenIntent

         */

        @NonNull

        @RequiresPermission(android.Manifest.permission.USE_FULL_SCREEN_INTENT)

        public Builder setFullScreenIntent(PendingIntent intent, boolean highPriority) {

            mN.fullScreenIntent = intent;

            setFlag(FLAG_HIGH_PRIORITY, highPriority);