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 #3" into sc-v2-dev am: ebe7d4996e

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

Change-Id: Id638e7e62599f06bbdecf5ff16d650a1f99dc348
This commit is contained in:
TreeHugger Robot
2022-01-07 22:40:30 +00:00
committed by Automerger Merge Worker
parent d454f6a1a4 ebe7d4996e
commit 6008fe7995
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -688,6 +688,8 @@ class UsbUserPermissionManager {
String packageName, String packageName,
PendingIntent pi, PendingIntent pi,
int uid) { int uid) {
boolean throwException = false;
// compare uid with packageName to foil apps pretending to be someone else // compare uid with packageName to foil apps pretending to be someone else
try { try {
ApplicationInfo aInfo = mContext.getPackageManager().getApplicationInfo(packageName, 0); ApplicationInfo aInfo = mContext.getPackageManager().getApplicationInfo(packageName, 0);
@@ -695,11 +697,13 @@ class UsbUserPermissionManager {
Slog.w(TAG, "package " + packageName Slog.w(TAG, "package " + packageName
+ " does not match caller's uid " + uid); + " does not match caller's uid " + uid);
EventLog.writeEvent(SNET_EVENT_LOG_ID, "180104273", -1, ""); EventLog.writeEvent(SNET_EVENT_LOG_ID, "180104273", -1, "");
throw new IllegalArgumentException("package " + packageName throwException = true;
+ " not found");
} }
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
throw new IllegalArgumentException("package " + packageName + " not found"); throwException = true;
} finally {
if (throwException)
throw new IllegalArgumentException("package " + packageName + " not found");
} }
requestPermissionDialog(device, accessory, canBeDefault, packageName, uid, mContext, pi); requestPermissionDialog(device, accessory, canBeDefault, packageName, uid, mContext, pi);