diff options
| author | 2021-11-08 12:00:11 +0000 | |
|---|---|---|
| committer | 2021-11-08 12:00:11 +0000 | |
| commit | d16fdbd693bcc1f40a8ad8a325ced56e2b6a30d8 (patch) | |
| tree | 0ca8d2578384441f052b3f8911ceccaeb42c354b | |
| parent | 6ff3d2241c9f5a9559c5fc35e6ade99e63f77b42 (diff) | |
| parent | ccb4fc52aa5c95819e6c2a31071f777d0b2b8f4d (diff) | |
Merge "Rename upload action to com.android.shell.action.PROFCOLLECT_UPLOAD" am: 473d29e6b1 am: 712e696cb4 am: ccb4fc52aa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884169
Change-Id: Id770b217565eeebabf820cb960b1848313567a59
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 6c4fa9684b1b..76b0b385dbda 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> diff --git a/services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java b/services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java index af65a2ad6a7d..4fb801e188d0 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 @@ 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) { |