diff options
| author | Bill Yi <byi@google.com> | 2020-05-06 15:59:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-05-06 15:59:08 +0000 |
| commit | 4806cccecef100744685c4ce5ab056e8a8daf2b2 (patch) | |
| tree | da880ace20ca75afb80f22f6d6737d207285b1b0 /core/java | |
| parent | 450ac958fdc6206758b2b479419dd7d4f428c753 (diff) | |
| parent | b61408add5839a01f40809fc05608af244c0e47d (diff) | |
Merge "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/IActivityManager.aidl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index 7a560c07a365..0feed7383020 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -299,7 +299,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. |