From 03042483504e8899292bee9158191a05111ecd80 Mon Sep 17 00:00:00 2001
From: James Wei <jameswei@google.com>
Date: Mon, 26 Jul 2021 21:25:17 +0800
Subject: [PATCH] USB: Adjust exception message in dealing with permission
 check

Bug: 180104273
Test: CtsVerifier USB Device Test
Change-Id: Ic676b0d16e7d34b8ddf9dcb218eed0aa41e36cc7
---
 .../java/com/android/server/usb/UsbUserPermissionManager.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java b/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java
index 5874b4b9fd3e5..9a12f0b825df5 100644
--- a/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java
+++ b/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java
@@ -673,8 +673,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");