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

Merge "USB: Adjust exception message in dealing with permission check" into sc-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-06 09:42:41 +00:00
committed by Android (Google) Code Review
parent 6925a160d0 bf0d59726a
commit 9ca7052183
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/usb/java/com/android/server/usb/UsbUserPermissionManager.java
View File

@@ -689,8 +689,10 @@ class UsbUserPermissionManager {
try { try {
ApplicationInfo aInfo = mContext.getPackageManager().getApplicationInfo(packageName, 0); ApplicationInfo aInfo = mContext.getPackageManager().getApplicationInfo(packageName, 0);
if (aInfo.uid != uid) { if (aInfo.uid != uid) {
throw new IllegalArgumentException("package " + packageName Slog.w(TAG, "package " + packageName
+ " does not match caller's uid " + uid); + " does not match caller's uid " + uid);
throw new IllegalArgumentException("package " + packageName
+ " not found");
} }
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
throw new IllegalArgumentException("package " + packageName + " not found"); throw new IllegalArgumentException("package " + packageName + " not found");