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

Commit 712e696c authored by Yi Kong's avatar Yi Kong Committed by Automerger Merge Worker
Browse files

Merge "Rename upload action to com.android.shell.action.PROFCOLLECT_UPLOAD" am: 473d29e6 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884169

Change-Id: I8fd5520e27ed54997f607b8145ceda7409e12148
parents a833f215 473d29e6

packages/Shell/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -646,7 +646,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) {