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

Commit 473ccd38 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Cancel outstanding user consent request"

parents df4629e9 5762741b

cmds/dumpstate/dumpstate.cpp

+9 −1
Original line number Original line Diff line number Diff line
@@ -2690,7 +2690,15 @@ Dumpstate::RunStatus Dumpstate::RunInternal(int32_t calling_uid, 
            MYLOGI(

            MYLOGI(

                "Did not receive user consent yet."

                "Did not receive user consent yet."

                " Will not copy the bugreport artifacts to caller.\n");

                " Will not copy the bugreport artifacts to caller.\n");

            // TODO(b/111441001): cancel outstanding requests

            const String16 incidentcompanion("incidentcompanion");

            sp<android::IBinder> ics(defaultServiceManager()->getService(incidentcompanion));

            if (ics != nullptr) {

                MYLOGD("Canceling user consent request via incidentcompanion service\n");

                android::interface_cast<android::os::IIncidentCompanion>(ics)->cancelAuthorization(

                        consent_callback_.get());

            } else {

                MYLOGD("Unable to cancel user consent; incidentcompanion service unavailable\n");

            }

        }

        }

    }

    }