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

Commit f3e74530 authored by Kristian Monsen's avatar Kristian Monsen Committed by android-build-merger
Browse files

Merge "Taking full bug report to get screenshot" into pi-dev 

am: 57532a22

Change-Id: I2b57b5f2db14e1023bdc89c3a3590b82c11c7704
parents 3cc91afb 57532a22

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

+3 −3
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    accessibilityShortcutActivated();

                    break;

                case MSG_BUGREPORT_TV:

                    takeBugreport();

                    requestFullBugreport();

                    break;

                case MSG_ACCESSIBILITY_TV:

                    if (mAccessibilityShortcutController.isAccessibilityShortcutAvailable(false)) {
@@ -4108,13 +4108,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        return mAccessibilityTvScheduled;

    }



    private void takeBugreport() {

    private void requestFullBugreport() {

        if ("1".equals(SystemProperties.get("ro.debuggable"))

                || Settings.Global.getInt(mContext.getContentResolver(),

                        Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) == 1) {

            try {

                ActivityManager.getService()

                        .requestBugReport(ActivityManager.BUGREPORT_OPTION_INTERACTIVE);

                        .requestBugReport(ActivityManager.BUGREPORT_OPTION_FULL);

            } catch (RemoteException e) {

                Slog.e(TAG, "Error taking bugreport", e);

            }