summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorGarfield Tan <xutan@google.com>2018-11-27 10:15:48 -0800
committerGarfield Tan <xutan@google.com>2018-11-28 09:26:59 -0800
commit015486394b8b3c7456cec09418f33f9736ee106d (patch)
treed7ad95934473b94d8052bb1034f1c26f6dbffaf4 /core/java/android
parent18b665d4cd40155e0008d699503d07ef892fcd00 (diff)
Add a test API to remove launch param records.
Some tests are broken because launch params are persisted between test cases. Bug: 120035844 Test: Manual test on the CTS. Change-Id: Ia4f23778467f73dad471487eb94979bfccde16d9
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/ActivityTaskManager.java14
-rw-r--r--core/java/android/app/IActivityTaskManager.aidl5
2 files changed, 19 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityTaskManager.java b/core/java/android/app/ActivityTaskManager.java
index 56ccf6f4a76f..6fdf7c8b4fac 100644
--- a/core/java/android/app/ActivityTaskManager.java
+++ b/core/java/android/app/ActivityTaskManager.java
@@ -433,4 +433,18 @@ public class ActivityTaskManager {
}
return sb.toString();
}
+
+ /**
+ * Clears launch params for the given package.
+ * @param packageNames the names of the packages of which the launch params are to be cleared
+ */
+ @TestApi
+ @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)
+ public void clearLaunchParamsForPackages(List<String> packageNames) {
+ try {
+ getService().clearLaunchParamsForPackages(packageNames);
+ } catch (RemoteException e) {
+ e.rethrowFromSystemServer();
+ }
+ }
}
diff --git a/core/java/android/app/IActivityTaskManager.aidl b/core/java/android/app/IActivityTaskManager.aidl
index 09b77d5b8d0a..777a4949a132 100644
--- a/core/java/android/app/IActivityTaskManager.aidl
+++ b/core/java/android/app/IActivityTaskManager.aidl
@@ -445,4 +445,9 @@ interface IActivityTaskManager {
void setPackageScreenCompatMode(in String packageName, int mode);
boolean getPackageAskScreenCompat(in String packageName);
void setPackageAskScreenCompat(in String packageName, boolean ask);
+
+ /**
+ * Clears launch params for given packages.
+ */
+ void clearLaunchParamsForPackages(in List<String> packageNames);
}