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

Commit f318ad52 authored by David Padlipsky's avatar David Padlipsky
Browse files

Update bug report shortcut to launch the bug handler app 

Updates the Meta + Ctrl + Backspace shortcut to open the assigned bug
handler.

Bug: 369926469
Test: Manually on device
Flag: EXEMPT due to minor update of debug behavior
Change-Id: I41fbfb94372f3698d3bce15195790c118ad563fd
parent dd6edec3

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

+6 −2
Original line number Diff line number Diff line
@@ -3608,7 +3608,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);

                        }
@@ -4102,7 +4104,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);

                    }

services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java

+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();

        }



    }