Merge "Update bug report shortcut to launch the bug handler app" into main (375073f5) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/PhoneWindowManager.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -3621,7 +3621,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		if (mEnableBugReportKeyboardShortcut && firstDown
		&& event.isMetaPressed() && event.isCtrlPressed()) {
		try {
		if (!mActivityManagerService.launchBugReportHandlerApp()) {
		mActivityManagerService.requestInteractiveBugReport();
		}
		} catch (RemoteException e) {
		Slog.d(TAG, "Error taking bugreport", e);
		}
		@@ -4117,7 +4119,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		case KeyGestureEvent.KEY_GESTURE_TYPE_TRIGGER_BUG_REPORT:
		if (complete && mEnableBugReportKeyboardShortcut) {
		try {
		if (!mActivityManagerService.launchBugReportHandlerApp()) {
		mActivityManagerService.requestInteractiveBugReport();
		}
		} catch (RemoteException e) {
		Slog.d(TAG, "Error taking bugreport", e);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -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();
		}

		}