Allow resource override on max number of actions in PiP

Moved the query of max number of pip actions from
ActivityTaskManagerService to ActivityTaskManager.

Note that TaskInfo#pictureInPictureParams is exposed via
TaskInfo#getPictureInPictureParams (annotated as @TestApi).

Bug: 168800594
Test: atest PinnedStackTests#testMaxNumberOfActions \
            PinnedStackTests#testFillMaxAllowedActions \
            PinnedStackTests#testRejectExceededActions
Change-Id: Ibcf2302e3ec87909543a1d6da0b64fd4565a061c

4 files changed, 14 insertions, 6 deletions

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 3c55bce4fc06..2ac345d2560a 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -2883,11 +2883,7 @@ public class Activity extends ContextThemeWrapper
      * but will always be at least three.
      */
     public int getMaxNumPictureInPictureActions() {
-        try {
-            return ActivityTaskManager.getService().getMaxNumPictureInPictureActions(mToken);
-        } catch (RemoteException e) {
-            return 0;
-        }
+        return ActivityTaskManager.getMaxNumPictureInPictureActions(this);
     }
 
     /**
diff --git a/core/java/android/app/ActivityTaskManager.java b/core/java/android/app/ActivityTaskManager.java
index c9b009becac4..c7b90897c8e7 100644
--- a/core/java/android/app/ActivityTaskManager.java
+++ b/core/java/android/app/ActivityTaskManager.java
@@ -437,6 +437,12 @@ public class ActivityTaskManager {
         return currentUiModeSupportsErrorDialogs(config);
     }
 
+    /** @return max allowed number of actions in picture-in-picture mode. */
+    public static int getMaxNumPictureInPictureActions(@NonNull Context context) {
+        return context.getResources().getInteger(
+                com.android.internal.R.integer.config_pictureInPictureMaxNumberOfActions);
+    }
+
     /**
      * Information you can retrieve about a root task in the system.
      * @hide
diff --git a/core/java/android/app/IActivityTaskManager.aidl b/core/java/android/app/IActivityTaskManager.aidl
index 8a03fcc33d51..bd5913efdecb 100644
--- a/core/java/android/app/IActivityTaskManager.aidl
+++ b/core/java/android/app/IActivityTaskManager.aidl
@@ -303,7 +303,6 @@ interface IActivityTaskManager {
     boolean enterPictureInPictureMode(in IBinder token, in PictureInPictureParams params);
     void setPictureInPictureParams(in IBinder token, in PictureInPictureParams params);
     void requestPictureInPictureMode(in IBinder token);
-    int getMaxNumPictureInPictureActions(in IBinder token);
     IBinder getUriPermissionOwnerForActivity(in IBinder activityToken);
 
     /**
diff --git a/core/java/android/app/TaskInfo.java b/core/java/android/app/TaskInfo.java
index 8a3ae04a3589..45e9c49c5322 100644
--- a/core/java/android/app/TaskInfo.java
+++ b/core/java/android/app/TaskInfo.java
@@ -241,6 +241,13 @@ public class TaskInfo {
     }
 
     /** @hide */
+    @Nullable
+    @TestApi
+    public PictureInPictureParams getPictureInPictureParams() {
+        return pictureInPictureParams;
+    }
+
+    /** @hide */
     public void addLaunchCookie(IBinder cookie) {
         if (cookie == null || launchCookies.contains(cookie)) return;
         launchCookies.add(cookie);