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

Commit 142c4097 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Delete bugreport file on bugreport cancel" into rvc-dev am: 8f08b1cd 

Change-Id: I7088f8d9a4d3f5f88038ec15b9a2435ab78d4eeb
parents 77000b83 8f08b1cd

packages/Shell/src/com/android/shell/BugreportProgressService.java

+9 −0
Original line number Diff line number Diff line
@@ -817,6 +817,7 @@ public class BugreportProgressService extends Service { 
                Log.i(TAG, "Cancelling bugreport service (ID=" + id + ") on user's request");

                mBugreportManager.cancelBugreport();

                info.deleteScreenshots();

                info.deleteBugreportFile();

            }

            stopProgressLocked(id);

        }
@@ -1972,6 +1973,14 @@ public class BugreportProgressService extends Service { 
            }

        }



        /**

         * Deletes bugreport file for a given bugreport.

         */

        private void deleteBugreportFile() {

            Log.i(TAG, "Deleting bugreport file " + bugreportFile);

            bugreportFile.delete();

        }



        /**

         * Rename all screenshots files so that they contain the new {@code name} instead of the

         * {@code initialName} if user has changed it.