Merge "Apply app switching protection on AppTask.moveToFront()" into qt-dev

2019-04-12 14:43:44 +00:00
parent 25fae38882 83946497ba
commit 89082d70f0
1 changed files with 4 additions and 0 deletions
--- 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);