diff options
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 8 | ||||
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index ad5c84026aa6..26651e586f0e 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -3608,7 +3608,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (mEnableBugReportKeyboardShortcut && firstDown && event.isMetaPressed() && event.isCtrlPressed()) { try { - mActivityManagerService.requestInteractiveBugReport(); + if (!mActivityManagerService.launchBugReportHandlerApp()) { + mActivityManagerService.requestInteractiveBugReport(); + } } catch (RemoteException e) { Slog.d(TAG, "Error taking bugreport", e); } @@ -4102,7 +4104,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { case KeyGestureEvent.KEY_GESTURE_TYPE_TRIGGER_BUG_REPORT: if (complete && mEnableBugReportKeyboardShortcut) { try { - mActivityManagerService.requestInteractiveBugReport(); + if (!mActivityManagerService.launchBugReportHandlerApp()) { + mActivityManagerService.requestInteractiveBugReport(); + } } catch (RemoteException e) { Slog.d(TAG, "Error taking bugreport", e); } diff --git a/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java b/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java index a85f8666d2e1..0f6a33823125 100644 --- a/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java +++ b/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java @@ -822,9 +822,9 @@ class TestPhoneWindowManager { void assertTakeBugreport(boolean wasCalled) throws RemoteException { mTestLooper.dispatchAll(); if (wasCalled) { - verify(mActivityManagerService).requestInteractiveBugReport(); + verify(mActivityManagerService).launchBugReportHandlerApp(); } else { - verify(mActivityManagerService, never()).requestInteractiveBugReport(); + verify(mActivityManagerService, never()).launchBugReportHandlerApp(); } } |