Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 255ffff5 authored by Joe Onorato's avatar Joe Onorato
Browse files

Make libincident into a stable C API. 

Test: atest GtsIncidentConfirmationTestCases GtsIncidentManagerTestCases libincident_test
Bug: 144187174
Change-Id: I65b5a13cfb6a57aa56f738e25a76c5ecb8e7a1a8
parent 374ba3fc

cmds/incident/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ cc_binary { 
        "libcutils",

        "liblog",

        "libutils",

        "libincident",

        "libincidentpriv",

    ],



    static_libs: [

cmds/incidentd/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ cc_binary { 
        "libbinder",

        "libdebuggerd_client",

        "libdumputils",

        "libincident",

        "libincidentpriv",

        "liblog",

        "libprotoutil",

        "libservices",
@@ -128,7 +128,7 @@ cc_test { 
        "libbinder",

        "libdebuggerd_client",

        "libdumputils",

        "libincident",

        "libincidentpriv",

        "liblog",

        "libprotobuf-cpp-full",

        "libprotoutil",

cmds/incidentd/TEST_MAPPING

0 → 100644
+13 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "incidentd_test"

    }

  ],

  "postsubmit": [

  ],

  "imports": [

  ]

}

cmds/statsd/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -278,7 +278,6 @@ cc_test { 
        "tests/e2e/ValueMetric_pull_e2e_test.cpp",

        "tests/e2e/WakelockDuration_e2e_test.cpp",

        "tests/external/GpuStatsPuller_test.cpp",

        "tests/external/IncidentReportArgs_test.cpp",

        "tests/external/puller_util_test.cpp",

        "tests/external/StatsCallbackPuller_test.cpp",

        "tests/external/StatsPuller_test.cpp",

cmds/statsd/src/subscriber/IncidentdReporter.cpp

+8 −19
Original line number Diff line number Diff line
@@ -21,10 +21,8 @@ 
#include "packages/UidMap.h"

#include "stats_log_util.h"



#include <android/os/IIncidentManager.h>

#include <android/os/IncidentReportArgs.h>

#include <android/util/ProtoOutputStream.h>

#include <binder/IServiceManager.h>

#include <incident/incident_report.h>



#include <vector>
@@ -132,7 +130,7 @@ bool GenerateIncidentReport(const IncidentdDetails& config, int64_t rule_id, int 
        return false;

    }



    IncidentReportArgs incidentReport;

    android::os::IncidentReportRequest incidentReport;



    vector<uint8_t> protoData;

    getProtoData(rule_id, metricId, dimensionKey, metricValue, configKey,
@@ -146,30 +144,21 @@ bool GenerateIncidentReport(const IncidentdDetails& config, int64_t rule_id, int 
    uint8_t dest;

    switch (config.dest()) {

        case IncidentdDetails_Destination_AUTOMATIC:

            dest = android::os::PRIVACY_POLICY_AUTOMATIC;

            dest = INCIDENT_REPORT_PRIVACY_POLICY_AUTOMATIC;

            break;

        case IncidentdDetails_Destination_EXPLICIT:

            dest = android::os::PRIVACY_POLICY_EXPLICIT;

            dest = INCIDENT_REPORT_PRIVACY_POLICY_EXPLICIT;

            break;

        default:

            dest = android::os::PRIVACY_POLICY_AUTOMATIC;

            dest = INCIDENT_REPORT_PRIVACY_POLICY_AUTOMATIC;

    }

    incidentReport.setPrivacyPolicy(dest);



    incidentReport.setReceiverPkg(config.receiver_pkg());

    incidentReport.setReceiverPackage(config.receiver_pkg());



    incidentReport.setReceiverCls(config.receiver_cls());

    incidentReport.setReceiverClass(config.receiver_cls());



    sp<IIncidentManager> service = interface_cast<IIncidentManager>(

            defaultServiceManager()->getService(android::String16("incident")));

    if (service == nullptr) {

        ALOGW("Failed to fetch incident service.");

        return false;

    }

    VLOG("Calling incidentd %p", service.get());

    binder::Status s = service->reportIncident(incidentReport);

    VLOG("Report incident status: %s", s.toString8().string());

    return s.isOk();

    return incidentReport.takeReport() == NO_ERROR;

}



}  // namespace statsd