diff options
| author | Rubin Xu <rubinxu@google.com> | 2022-03-28 10:10:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-03-28 10:10:02 +0000 |
| commit | e56c084d4b4d3c36dff80f3c178e590128fc4e2c (patch) | |
| tree | e2ab4f2ce245a1c205ed496542499c634ddea2e0 /core | |
| parent | 2f44835733597ac7c9e9f2c5525405b486321916 (diff) | |
| parent | f62904fd707b5b8999e44428f50690d0ee09cd5a (diff) | |
Merge "Secure REMOTE_BUGREPORT_DISPATCH" into sc-v2-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/IActivityManager.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index 64a9c441c57f..9e23b5fa692b 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -438,7 +438,7 @@ interface IActivityManager { void requestInteractiveBugReport(); void requestFullBugReport(); - void requestRemoteBugReport(); + void requestRemoteBugReport(long nonce); boolean launchBugReportHandlerApp(); List<String> getBugreportWhitelistedPackages(); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index a37979a2417f..ff072c268449 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -497,6 +497,14 @@ public class DevicePolicyManager { "android.intent.extra.REMOTE_BUGREPORT_HASH"; /** + * Extra for shared bugreport's nonce in long integer type. + * + * @hide + */ + public static final String EXTRA_REMOTE_BUGREPORT_NONCE = + "android.intent.extra.REMOTE_BUGREPORT_NONCE"; + + /** * Extra for remote bugreport notification shown type. * * @hide |