For full & interactive bugreports, collect consent only after critical dumpsys has completed.
This way each type of dumpstate can control the timing of the consent
more precisely. Right now this is necessary because otherwise consent is
going to interfere with sysui states all the time.
Also some minor name changes for clarify on the way.
Bug: 142921485
Test: build & flash, br captured with API does not have consent screen
in critical dumpsys. i.e. Grepping ConfirmationActivity from permission
controller within critical dumpsys yields no result.
Change-Id: I30c1bd9559af82ebdb6dc56e91ca81d0f2745270
diff --git a/cmds/dumpstate/dumpstate.h b/cmds/dumpstate/dumpstate.h
index 831574d..7d9b113 100644
--- a/cmds/dumpstate/dumpstate.h
+++ b/cmds/dumpstate/dumpstate.h
@@ -486,7 +486,9 @@
private:
RunStatus RunInternal(int32_t calling_uid, const std::string& calling_package);
- void CheckUserConsent(int32_t calling_uid, const android::String16& calling_package);
+ RunStatus DumpstateDefaultAfterCritical();
+
+ void MaybeCheckUserConsent(int32_t calling_uid, const std::string& calling_package);
// Removes the in progress files output files (tmp file, zip/txt file, screenshot),
// but leaves the log file alone.