commit 473d29e6b1796b8be53a624be3bd2055603d4df3
author Yi Kong <yikong@google.com> Mon Nov 08 11:11:07 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 08 11:11:07 2021 +0000
tree 358f59b9580d568297c6dba4052949d7c3fd1119
parent 385935d07f61d1d7db1f70e89ce092ae1fd97673
parent b324a7418a4d2a64133f144e5f9fa4f74fdc5306

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

packages/Shell/AndroidManifest.xml

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 6c4fa96..76b0b38 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -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

diff --git a/services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java b/services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java
index af65a2a..4fb801e 100644
--- a/services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java
+++ b/services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java
@@ -315,7 +315,7 @@
                 // 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) {