diff options
| -rw-r--r-- | core/java/android/view/WindowManagerPolicyConstants.java | 6 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 5 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 11 |
5 files changed, 23 insertions, 2 deletions
diff --git a/core/java/android/view/WindowManagerPolicyConstants.java b/core/java/android/view/WindowManagerPolicyConstants.java index a22f5a576ab6..f8bcb0010b48 100644 --- a/core/java/android/view/WindowManagerPolicyConstants.java +++ b/core/java/android/view/WindowManagerPolicyConstants.java @@ -72,6 +72,12 @@ public interface WindowManagerPolicyConstants { "android.intent.action.USER_ACTIVITY_NOTIFICATION"; /** + * Broadcast sent when a (custom) bugreport is requested. + */ + String ACTION_CUSTOM_BUGREPORT_REQUESTED = + "android.intent.action.CUSTOM_BUGREPORT_REQUESTED"; + + /** * Sticky broadcast of the current HDMI plugged state. */ String ACTION_HDMI_PLUGGED = "android.intent.action.HDMI_PLUGGED"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index fd4e7c6068b6..1c48a74b8dc7 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -96,6 +96,7 @@ <protected-broadcast android:name="android.intent.action.USER_ACTIVITY_NOTIFICATION" /> <protected-broadcast android:name="android.intent.action.MY_PACKAGE_SUSPENDED" /> <protected-broadcast android:name="android.intent.action.MY_PACKAGE_UNSUSPENDED" /> + <protected-broadcast android:name="android.intent.action.CUSTOM_BUGREPORT_REQUESTED" /> <protected-broadcast android:name="android.os.action.POWER_SAVE_MODE_CHANGED" /> <protected-broadcast android:name="android.os.action.POWER_SAVE_MODE_CHANGING" /> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 9073a02e72d3..57f99a97a97e 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -4287,4 +4287,9 @@ <!-- Whether or not to use assistant stream volume separately from music volume --> <bool name="config_useAssistantVolume">false</bool> + + <!-- Whether to use a custom Bugreport handling. When true, ACTION_CUSTOM_BUGREPORT_REQUESTED + intent is broadcasted on bugreporting chord (instead of the default full bugreport + generation). --> + <bool name="config_customBugreport">false</bool> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 356ec2bb4f34..2a175486663c 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3800,5 +3800,5 @@ <!-- Assistant handles --> <java-symbol type="dimen" name="assist_handle_shadow_radius" /> - + <java-symbol type="bool" name="config_customBugreport" /> </resources> diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 5a124a717de2..858180b6e251 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -697,7 +697,16 @@ public class PhoneWindowManager implements WindowManagerPolicy { accessibilityShortcutActivated(); break; case MSG_BUGREPORT_TV: - requestFullBugreport(); + boolean customBugreport = mContext.getResources().getBoolean( + com.android.internal.R.bool.config_customBugreport); + if (customBugreport) { + Log.i(TAG, "Triggering a custom bugreport!"); + Intent intent = new Intent(ACTION_CUSTOM_BUGREPORT_REQUESTED); + intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); + mContext.sendBroadcastAsUser(intent, UserHandle.ALL); + } else { + requestFullBugreport(); + } break; case MSG_ACCESSIBILITY_TV: if (mAccessibilityShortcutController.isAccessibilityShortcutAvailable(false)) { |