commit e42a405ee8940f326b6effbc03d40a99038b6201
author Nandana Dutt <nandana@google.com> Mon Mar 25 01:53:34 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Mar 25 01:53:34 2019 -0700
tree d7afd6b2e556ee5fa9c860ce9e8193c7eb54dd59
parent 4aea56297c0ba7efd0495d99e85378b38e634684
parent 8cf74c36c08c24bd2802d0c31446b12926f25f93

Merge "Stop bugreportd if binder call fails"
am: 8cf74c36c0

Change-Id: Ife5c3c7090423b084b829c16f1d7d4a931c1936e

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

diff --git a/services/core/java/com/android/server/os/BugreportManagerServiceImpl.java b/services/core/java/com/android/server/os/BugreportManagerServiceImpl.java
index 5c0874d..c98a79a 100644
--- a/services/core/java/com/android/server/os/BugreportManagerServiceImpl.java
+++ b/services/core/java/com/android/server/os/BugreportManagerServiceImpl.java
@@ -174,7 +174,11 @@
             ds.startBugreport(callingUid, callingPackage,
                     bugreportFd, screenshotFd, bugreportMode, myListener);
         } catch (RemoteException e) {
-            reportError(listener, IDumpstateListener.BUGREPORT_ERROR_RUNTIME_ERROR);
+            // bugreportd service is already started now. We need to kill it to manage the
+            // lifecycle correctly. If we don't subsequent callers will get
+            // BUGREPORT_ERROR_ANOTHER_REPORT_IN_PROGRESS error.
+            // Note that listener will be notified by the death recipient below.
+            cancelBugreport();
         }
     }