From 83946497bab277487cdf6c666864ce341d2661fd Mon Sep 17 00:00:00 2001
From: Ricky Wai <rickywai@google.com>
Date: Thu, 11 Apr 2019 17:26:57 +0100
Subject: [PATCH] Apply app switching protection on AppTask.moveToFront()

Bug: 129356848
Test: After pressing home button, apps can't be shown automatically
Change-Id: I0d50deae0024c61df3e68fc7cf2d63815a757ef9
---
 services/core/java/com/android/server/wm/AppTaskImpl.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/core/java/com/android/server/wm/AppTaskImpl.java b/services/core/java/com/android/server/wm/AppTaskImpl.java
index e967a92f1891a..78f1e69d46497 100644
--- a/services/core/java/com/android/server/wm/AppTaskImpl.java
+++ b/services/core/java/com/android/server/wm/AppTaskImpl.java
@@ -106,6 +106,10 @@ class AppTaskImpl extends IAppTask.Stub {
         final long origId = Binder.clearCallingIdentity();
         try {
             synchronized (mService.mGlobalLock) {
+                if (!mService.checkAppSwitchAllowedLocked(callingPid, callingUid, -1, -1,
+                        "Move to front")) {
+                    return;
+                }
                 WindowProcessController callerApp = null;
                 if (appThread != null) {
                     callerApp = mService.getProcessController(appThread);