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

Commit d6199f46 authored by Abhijeet Kaur's avatar Abhijeet Kaur Committed by android-build-merger
Browse files

Merge "Cancel outstanding user consent request" am: 473ccd38 am: cd8f8cbb 

am: f063e270

Change-Id: I6b52f9578cb50b04474fc67ddf00e7bf02585aa2
parents 2e5c6bb3 f063e270

cmds/dumpstate/dumpstate.cpp

+9 −1
Original line number Original line Diff line number Diff line
@@ -2696,7 +2696,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");

            }

        }

        }

    }

    }