commit f673393b93ef7ae06eb2f96ab2d2b8c6af138e65
author Wale Ogunwale <ogunwale@google.com> Wed Jun 27 05:14:34 2018 -0700
committer Wale Ogunwale <ogunwale@google.com> Fri Jun 29 23:51:01 2018 +0000
tree 3d0651db6a622612ebf1b20dc1bf208b13e8e34e
parent faa0516e0b10708a3de95830000a0e565860af35

Moved more stuff from ActivityManagerService to ActivityTaskManagerService (11/n)

Moved more stuff related to activities out of the current service to the new one.

Bug: 80414790
Fixes: 110988007
Test: Existing tests pass.
Change-Id: Iceed1da8a7441a26d11efebc6d9f692fd053bc7f

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

diff --git a/services/core/java/com/android/server/am/SafeActivityOptions.java b/services/core/java/com/android/server/am/SafeActivityOptions.java
index fef3b86..f7de7f4 100644
--- a/services/core/java/com/android/server/am/SafeActivityOptions.java
+++ b/services/core/java/com/android/server/am/SafeActivityOptions.java
@@ -230,7 +230,7 @@
 
         // Check permission for remote animations
         final RemoteAnimationAdapter adapter = options.getRemoteAnimationAdapter();
-        if (adapter != null && supervisor.mService.mAm.checkPermission(
+        if (adapter != null && supervisor.mService.checkPermission(
                 CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS, callingPid, callingUid)
                         != PERMISSION_GRANTED) {
             final String msg = "Permission Denial: starting " + getIntentString(intent)