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

Commit a6ea812d authored by Ronish Kalia's avatar Ronish Kalia Committed by Android (Google) Code Review
Browse files

Merge "Fix CtsRootBugreportTestCases on the following assumption" into main

parents c59174b9 ce32edc3

services/core/java/com/android/server/os/BugreportManagerServiceImpl.java

+10 −0
Original line number Diff line number Diff line
@@ -184,6 +184,16 @@ class BugreportManagerServiceImpl extends IDumpstate.Stub { 
                        throwInvalidBugreportFileForCallerException(

                                bugreportFile, callingInfo.second);

                    }



                    boolean keepBugreportOnRetrieval = false;

                    if (onboardingBugreportV2Enabled()) {

                        keepBugreportOnRetrieval = mBugreportFilesToPersist.contains(

                                bugreportFile);

                    }



                    if (!keepBugreportOnRetrieval) {

                        bugreportFilesForUid.remove(bugreportFile);

                    }

                } else {

                    ArraySet<String> bugreportFilesForCaller = mBugreportFiles.get(callingInfo);

                    if (bugreportFilesForCaller != null