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

Commit 473d29e6 authored by Yi Kong's avatar Yi Kong Committed by Gerrit Code Review
Browse files

Merge "Rename upload action to com.android.shell.action.PROFCOLLECT_UPLOAD"

parents 385935d0 b324a741

packages/Shell/AndroidManifest.xml

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

            android:exported="true"

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

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

            <intent-filter>

            <intent-filter>

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

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

            </intent-filter>

            </intent-filter>

        </receiver>

        </receiver>

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

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

                // Upload the report

                Intent intent = new Intent()

                Intent intent = new Intent()

                        .setPackage("com.android.shell")

                        .setPackage("com.android.shell")

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

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

                        .putExtra("filename", reportName);

                        .putExtra("filename", reportName);

                context.sendBroadcast(intent);

                context.sendBroadcast(intent);

            } catch (RemoteException e) {

            } catch (RemoteException e) {