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

Ensure only valid events are reported.

Browse Source 
When CHOOSER_ACTION events are reported via reportChooserSelection, make
sure the package name is not null and is also a valid, installed package.

Bug: 229633537
Bug: 253403242
Test: atest UsageStatsTest
Change-Id: Ib28014f2d21b451d2f7f6e7136f500fc49d0779b
This commit is contained in:
Varun Shah
2023-05-06 00:13:39 +00:00
parent 3e09bdb54e
commit 08a8c4371a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/usage/java/com/android/server/usage/UsageStatsService.java
View File

@@ -2539,10 +2539,14 @@ public class UsageStatsService extends SystemService implements
}
@Override
public void reportChooserSelection(String packageName, int userId, String contentType,
String[] annotations, String action) {
public void reportChooserSelection(@NonNull String packageName, int userId,
String contentType, String[] annotations, String action) {
if (packageName == null) {
Slog.w(TAG, "Event report user selecting a null package");
throw new IllegalArgumentException("Package selection must not be null.");
}
// Verify if this package exists before reporting an event for it.
if (mPackageManagerInternal.getPackageUid(packageName, 0, userId) < 0) {
Slog.w(TAG, "Event report user selecting an invalid package");
return;
}