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

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

Change-Id: I978ebd538bf52d928e655cfb9c8f9f75c34e8eeb

1 files changed, 3 insertions, 1 deletions

diff --git a/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java b/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java
index 7b6ccd31adcc..49ea9df5b26f 100644
--- a/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java
+++ b/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java
@@ -689,8 +689,10 @@ class UsbUserPermissionManager {
         try {
             ApplicationInfo aInfo = mContext.getPackageManager().getApplicationInfo(packageName, 0);
             if (aInfo.uid != uid) {
-                throw new IllegalArgumentException("package " + packageName
+                Slog.w(TAG, "package " + packageName
                         + " does not match caller's uid " + uid);
+                throw new IllegalArgumentException("package " + packageName
+                        + " not found");
             }
         } catch (PackageManager.NameNotFoundException e) {
             throw new IllegalArgumentException("package " + packageName + " not found");