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

Commit 3c429ff1 authored by Michal Olech's avatar Michal Olech Committed by Android (Google) Code Review
Browse files

Merge "Revert "Introduce config_customBugreport option""

parents e1000eae 8c5bc3b6

core/java/android/view/WindowManagerPolicyConstants.java

+0 −6
Original line number Diff line number Diff line
@@ -71,12 +71,6 @@ public interface WindowManagerPolicyConstants { 
    String ACTION_USER_ACTIVITY_NOTIFICATION =

            "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.

     */

core/res/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ 
    <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" />

core/res/res/values/config.xml

+0 −5
Original line number Diff line number Diff line
@@ -4284,9 +4284,4 @@ 


    <!-- 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>

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -3800,5 +3800,5 @@ 
  <!-- Assistant handles -->

  <java-symbol type="dimen" name="assist_handle_shadow_radius" />



  <java-symbol type="bool" name="config_customBugreport" />



</resources>

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

+1 −10
Original line number Diff line number Diff line
@@ -697,16 +697,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    accessibilityShortcutActivated();

                    break;

                case MSG_BUGREPORT_TV:

                    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)) {