Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename upload action to com.android.shell.action.PROFCOLLECT_UPLOAD" am: 473d29e6b1 am: 712e696cb4

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

Change-Id: I34e9294e55a09d33e2bd97c3bd99b2dc1a2da5b2
This commit is contained in:
Yi Kong
2021-11-08 11:42:52 +00:00
committed by Automerger Merge Worker
parent b87acfcfde 712e696cb4
commit ccb4fc52aa
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Shell/AndroidManifest.xml
View File

@@ -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>

2
services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java
View File

@@ -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) {