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

Commit d117f9cc authored by Hui Yu's avatar Hui Yu Committed by Automerger Merge Worker
Browse files

Merge "Specify temp-allowlist reasonCode while calling... 

Merge "Specify temp-allowlist reasonCode while calling setPendingIntentAllowlistDuration()." into sc-dev am: edc573f0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba60d9506c2bca90a7388b7064f4a1da831f7df2
parents 3c9d9a67 edc573f0

core/java/android/app/ActivityManagerInternal.java

+0 −4
Original line number Original line Diff line number Diff line
@@ -113,10 +113,6 @@ public abstract class ActivityManagerInternal { 
            IBinder allowlistToken, long duration, @TempAllowListType int type,

            IBinder allowlistToken, long duration, @TempAllowListType int type,

            @ReasonCode int reasonCode, @Nullable String reason);

            @ReasonCode int reasonCode, @Nullable String reason);





    @Deprecated

    public abstract void setPendingIntentWhitelistDuration(IIntentSender target,

            IBinder allowlistToken, long duration, @TempAllowListType int type);



    /**

    /**

     * Returns the flags set for a {@link PendingIntent}.

     * Returns the flags set for a {@link PendingIntent}.

     */

     */

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −7
Original line number Original line Diff line number Diff line
@@ -15126,13 +15126,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
                    duration, type, reasonCode, reason);

                    duration, type, reasonCode, reason);

        }

        }

















        @Override














        public void setPendingIntentWhitelistDuration(IIntentSender target, IBinder allowlistToken,














                long duration, int type) {














            mPendingIntentController.setPendingIntentAllowlistDuration(target, allowlistToken,














                    duration, type, REASON_UNKNOWN, "");














        }



























        @Override







        @Override











        public int getPendingIntentFlags(IIntentSender target) {







        public int getPendingIntentFlags(IIntentSender target) {











            return mPendingIntentController.getPendingIntentFlags(target);







            return mPendingIntentController.getPendingIntentFlags(target);

























services/core/java/com/android/server/notification/NotificationManagerService.java



+6
−3




























Original line number
Original line
Diff line number
Diff line








@@ -64,6 +64,8 @@ import static android.media.AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY;









import static android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE;







import static android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE;











import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_CRITICAL;







import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_CRITICAL;











import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_NORMAL;







import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_NORMAL;














import static android.os.PowerWhitelistManager.REASON_NOTIFICATION_SERVICE;














import static android.os.PowerWhitelistManager.TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_ALLOWED;











import static android.os.UserHandle.USER_NULL;







import static android.os.UserHandle.USER_NULL;











import static android.os.UserHandle.USER_SYSTEM;







import static android.os.UserHandle.USER_SYSTEM;











import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING;







import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING;










@@ -6027,10 +6029,11 @@ public class NotificationManagerService extends SystemService {









                for (int i = 0; i < intentCount; i++) {







                for (int i = 0; i < intentCount; i++) {











                    PendingIntent pendingIntent = notification.allPendingIntents.valueAt(i);







                    PendingIntent pendingIntent = notification.allPendingIntents.valueAt(i);











                    if (pendingIntent != null) {







                    if (pendingIntent != null) {











                        am.setPendingIntentWhitelistDuration(pendingIntent.getTarget(),







                        am.setPendingIntentAllowlistDuration(pendingIntent.getTarget(),











                                ALLOWLIST_TOKEN, duration,







                                ALLOWLIST_TOKEN, duration,











                                BroadcastOptions.TEMPORARY_WHITELIST_TYPE_FOREGROUND_SERVICE_ALLOWED







                                TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_ALLOWED,











                        );







                                REASON_NOTIFICATION_SERVICE,














                                "NotificationManagerService");











                        am.setPendingIntentAllowBgActivityStarts(pendingIntent.getTarget(),







                        am.setPendingIntentAllowBgActivityStarts(pendingIntent.getTarget(),











                                ALLOWLIST_TOKEN, (FLAG_ACTIVITY_SENDER | FLAG_BROADCAST_SENDER







                                ALLOWLIST_TOKEN, (FLAG_ACTIVITY_SENDER | FLAG_BROADCAST_SENDER











                                        | FLAG_SERVICE_SENDER));







                                        | FLAG_SERVICE_SENDER));