summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-03-06 01:15:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-03-06 01:15:38 +0000
commit97f5b4092ae715075e0b936040ba2e7d7c379935 (patch)
tree7c741217d0f93dfb1dc5db465c7db4ad65cf538c /core/java/android
parent27e5817c14c3a42cc50d349b2882ab3b62ab03aa (diff)
parent38567a6051bbc38041048fa36f5e83ac00adba70 (diff)
Merge "DO NOT MERGE - Kill apps outright for API contract violations" into qt-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/IActivityManager.aidl3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl
index 48ca71690a1b..c0c63555b10a 100644
--- a/core/java/android/app/IActivityManager.aidl
+++ b/core/java/android/app/IActivityManager.aidl
@@ -287,7 +287,8 @@ interface IActivityManager {
void handleApplicationStrictModeViolation(in IBinder app, int penaltyMask,
in StrictMode.ViolationInfo crashInfo);
boolean isTopActivityImmersive();
- void crashApplication(int uid, int initialPid, in String packageName, int userId, in String message);
+ void crashApplication(int uid, int initialPid, in String packageName, int userId,
+ in String message, boolean force);
@UnsupportedAppUsage
String getProviderMimeType(in Uri uri, int userId);
// Cause the specified process to dump the specified heap.