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

Commit 786c69ed authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "presubmit-am-616d8c1027a84e8c80568b9c71425b35" into... 

Merge changes from topic "presubmit-am-616d8c1027a84e8c80568b9c71425b35" into tm-mainline-prod am: b1116d3d

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



Change-Id: Ic251b3b12435680b6185b2876d40d9e1a0798d6b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a26b0c38 b1116d3d

services/core/java/com/android/server/policy/PermissionPolicyService.java

+9 −2
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ import android.content.pm.PackageManagerInternal.PackageListObserver; 
import android.content.pm.PermissionInfo;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.os.Process;

import android.os.RemoteException;

import android.os.ServiceManager;
@@ -160,11 +162,13 @@ public final class PermissionPolicyService extends SystemService { 
    private NotificationManagerInternal mNotificationManager;

    private final KeyguardManager mKeyguardManager;

    private final PackageManager mPackageManager;

    private final Handler mHandler;



    public PermissionPolicyService(@NonNull Context context) {

        super(context);



        mContext = context;

        mHandler = new Handler(Looper.getMainLooper());

        mPackageManager = context.getPackageManager();

        mKeyguardManager = context.getSystemService(KeyguardManager.class);

        LocalServices.addService(PermissionPolicyInternal.class, new Internal());
@@ -1068,8 +1072,11 @@ public final class PermissionPolicyService extends SystemService { 
                                activityInfo.packageName, user)) {

                            clearNotificationReviewFlagsIfNeeded(activityInfo.packageName, user);

                        } else {

                            showNotificationPromptIfNeeded(activityInfo.packageName,

                                    taskInfo.userId, taskInfo.taskId, info);

                            // Post the activity start checks to ensure the notification channel

                            // checks happen outside the WindowManager global lock.

                            mHandler.post(() -> showNotificationPromptIfNeeded(

                                    activityInfo.packageName, taskInfo.userId, taskInfo.taskId,

                                    info));

                        }

                    }

                };

services/core/java/com/android/server/wm/ActivityInterceptorCallback.java

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ import java.lang.annotation.Retention; 
import java.lang.annotation.RetentionPolicy;



/**

 * Callback to intercept activity starts and possibly block/redirect them.

 * Callback to intercept activity starts and possibly block/redirect them. The callback methods will

 * be called with the WindowManagerGlobalLock held.

 */

public abstract class ActivityInterceptorCallback {

    /**