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

Commit 7f9789be authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Rename upload action to... 

Merge "Merge "Rename upload action to com.android.shell.action.PROFCOLLECT_UPLOAD" am: 473d29e6 am: 712e696c am: ccb4fc52 am: d16fdbd6 am: 5b40c28e"
parents adf6b8d5 9557ce3e

packages/Shell/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ 
            android:exported="true"

            android:permission="android.permission.TRIGGER_SHELL_PROFCOLLECT_UPLOAD" >

            <intent-filter>

                <action android:name="com.android.shell.action.UPLOAD_REPORT" />

                <action android:name="com.android.shell.action.PROFCOLLECT_UPLOAD" />

            </intent-filter>

        </receiver>

services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ public final class ProfcollectForwardingService extends SystemService { 
                // Upload the report

                Intent intent = new Intent()

                        .setPackage("com.android.shell")

                        .setAction("com.android.shell.action.UPLOAD_REPORT")

                        .setAction("com.android.shell.action.PROFCOLLECT_UPLOAD")

                        .putExtra("filename", reportName);

                context.sendBroadcast(intent);

            } catch (RemoteException e) {