commit 3cddb972f3dedb3b6058bb8aae9c8f72fd586537
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 27 11:49:41 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 27 11:49:41 2020 +0000
tree 87ffa2a44ca86cad38bd7edddde8649bf529c124
parent 252510c73452d92fbf29bc0665eaab0bbc2b26b1
parent 6236b25023dc1dd02b8c05cef92f5f5054908a4d

Merge "Increase buffer size for Java Heap Prof CTS." am: 11944f7122 am: 6236b25023

Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/1411790

Change-Id: I85edb30910c21f04774d2985f2f9fb96d6d30e86

src/android_internal/incident_service.cc

diff --git a/src/android_internal/incident_service.cc b/src/android_internal/incident_service.cc
index 10a0f81..5e23afb 100644
--- a/src/android_internal/incident_service.cc
+++ b/src/android_internal/incident_service.cc
@@ -16,11 +16,10 @@
 
 #include "src/android_internal/incident_service.h"
 
-#include <android/os/IIncidentManager.h>
-#include <android/os/IncidentReportArgs.h>
 #include <binder/IBinder.h>
 #include <binder/IServiceManager.h>
 #include <binder/Status.h>
+#include <incident/incident_report.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -31,34 +30,27 @@
 
 bool StartIncidentReport(const char* dest_pkg,
                          const char* dest_class,
-                         int privacy_level) {
-  android::os::IncidentReportArgs incidentReport;
-  incidentReport.addSection(3026);  // system_trace only
-
-  if (privacy_level != android::os::PRIVACY_POLICY_AUTOMATIC &&
-      privacy_level != android::os::PRIVACY_POLICY_EXPLICIT) {
+                         int privacy_policy) {
+  if (privacy_policy != INCIDENT_REPORT_PRIVACY_POLICY_AUTOMATIC &&
+      privacy_policy != INCIDENT_REPORT_PRIVACY_POLICY_EXPLICIT) {
     return false;
   }
-  incidentReport.setPrivacyPolicy(privacy_level);
 
-  std::string pkg(dest_pkg);
-  std::string cls(dest_class);
-  if (pkg.size() == 0 || cls.size() == 0) {
+  if (strlen(dest_pkg) == 0 || strlen(dest_class) == 0) {
     return false;
   }
-  incidentReport.setReceiverPkg(pkg);
-  incidentReport.setReceiverCls(cls);
 
-  android::sp<android::os::IIncidentManager> service =
-      android::interface_cast<android::os::IIncidentManager>(
-          android::defaultServiceManager()->getService(
-              android::String16("incident")));
+  AIncidentReportArgs* args = AIncidentReportArgs_init();
 
-  if (!service) {
-    return false;
-  }
-  android::binder::Status s = service->reportIncident(incidentReport);
-  return s.isOk();
+  AIncidentReportArgs_addSection(args, 3026);  // system_trace only
+  AIncidentReportArgs_setPrivacyPolicy(args, privacy_policy);
+  AIncidentReportArgs_setReceiverPackage(args, dest_pkg);
+  AIncidentReportArgs_setReceiverClass(args, dest_class);
+
+  int err = AIncidentReportArgs_takeReport(args);
+  AIncidentReportArgs_delete(args);
+
+  return err == 0;
 }
 
 }  // namespace android_internal

test/cts/AndroidTest.xml

diff --git a/test/cts/AndroidTest.xml b/test/cts/AndroidTest.xml
index 3d40593..81d39c3 100644
--- a/test/cts/AndroidTest.xml
+++ b/test/cts/AndroidTest.xml
@@ -17,7 +17,7 @@
 <configuration description="Config for CTS Perfetto test cases">
     <option name="config-descriptor:metadata" key="component" value="metrics" />
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
-    <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
     <option name="test-suite-tag" value="cts" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">