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

Commit 2ae76e46 authored by Abhijeet Kaur's avatar Abhijeet Kaur Committed by Android (Google) Code Review
Browse files

Merge "Migrate Shell app to use the new bugreport API."

parents bc03b2a7 767c8bb9

core/java/android/util/FeatureFlagUtils.java

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ public class FeatureFlagUtils { 
    static {

        DEFAULT_FLAGS = new HashMap<>();

        DEFAULT_FLAGS.put("settings_audio_switcher", "true");

        DEFAULT_FLAGS.put("settings_call_bugreport_api", "false");

        DEFAULT_FLAGS.put("settings_mobile_network_v2", "true");

        DEFAULT_FLAGS.put("settings_network_and_internet_v2", "true");

        DEFAULT_FLAGS.put("settings_systemui_theme", "true");

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -2809,6 +2809,13 @@ 
    <permission android:name="android.permission.STATUS_BAR"

        android:protectionLevel="signature|privileged" />



    <!-- Allows an application to trigger bugreport via shell using the bugreport API.

        <p>Not for use by third-party applications.

        @hide

    -->

    <permission android:name="android.permission.TRIGGER_SHELL_BUGREPORT"

        android:protectionLevel="signature" />



    <!-- Allows an application to be the status bar.  Currently used only by SystemUI.apk

    @hide -->

    <permission android:name="android.permission.STATUS_BAR_SERVICE"

data/etc/framework-sysconfig.xml

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ 
    <backup-transport-whitelisted-service

        service="com.android.localtransport/.LocalTransportService" />



    <!-- Whitelist Shell to use the bugreport API -->

    <bugreport-whitelisted package="com.android.shell" />



    <!-- Whitelist of bundled applications which all handle URLs to their websites by default -->

    <app-link package="com.android.carrierdefaultapp" />

</config>

packages/Shell/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -254,6 +254,14 @@ 
            </intent-filter>

        </receiver>



        <receiver

            android:name=".BugreportRequestedReceiver"

            android:permission="android.permission.TRIGGER_SHELL_BUGREPORT">

            <intent-filter>

                <action android:name="com.android.internal.intent.action.BUGREPORT_REQUESTED" />

            </intent-filter>

        </receiver>



        <service

            android:name=".BugreportProgressService"

            android:exported="false"/>

packages/Shell/src/com/android/shell/BugreportProgressService.java

+282 −97

File changed.

Preview size limit exceeded, changes collapsed.