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

Commit 78e1375a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Moved bugreport intents to the com.android.internal namespace."

parents c454a745 92aaaa21

packages/Shell/AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -154,8 +154,8 @@ 
            android:name=".BugreportReceiver"

            android:permission="android.permission.DUMP">

            <intent-filter>

                <action android:name="android.intent.action.BUGREPORT_STARTED" />

                <action android:name="android.intent.action.BUGREPORT_FINISHED" />

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

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

            </intent-filter>

        </receiver>
@@ -163,7 +163,7 @@ 
            android:name=".RemoteBugreportReceiver"

            android:permission="android.permission.DUMP">

            <intent-filter>

                <action android:name="android.intent.action.REMOTE_BUGREPORT_FINISHED" />

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

            </intent-filter>

        </receiver>

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

+5 −3
Original line number Diff line number Diff line
@@ -133,10 +133,12 @@ public class BugreportProgressService extends Service { 
    private static final String AUTHORITY = "com.android.shell";



    // External intents sent by dumpstate.

    static final String INTENT_BUGREPORT_STARTED = "android.intent.action.BUGREPORT_STARTED";

    static final String INTENT_BUGREPORT_FINISHED = "android.intent.action.BUGREPORT_FINISHED";

    static final String INTENT_BUGREPORT_STARTED =

            "com.android.internal.intent.action.BUGREPORT_STARTED";

    static final String INTENT_BUGREPORT_FINISHED =

            "com.android.internal.intent.action.BUGREPORT_FINISHED";

    static final String INTENT_REMOTE_BUGREPORT_FINISHED =

            "android.intent.action.REMOTE_BUGREPORT_FINISHED";

            "com.android.internal.intent.action.REMOTE_BUGREPORT_FINISHED";



    // Internal intents used on notification actions.

    static final String INTENT_BUGREPORT_CANCEL = "android.intent.action.BUGREPORT_CANCEL";

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ public class ActivityManagerService extends IActivityManager.Stub 














    // Intent sent when remote bugreport collection has been completed















    private static final String INTENT_REMOTE_BUGREPORT_FINISHED =













            "android.intent.action.REMOTE_BUGREPORT_FINISHED";













            "com.android.internal.intent.action.REMOTE_BUGREPORT_FINISHED";





























    // Used to indicate that an app transition should be animated.















    static final boolean ANIMATE = true;