Merge "USB: Adjust exception message in dealing with permission check #3" into sc-v2-dev am: ebe7d4996e am: 6008fe7995

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

Change-Id: Iafde993260e85c53382726b2130f9c933fb7f453

services/usb/java/com/android/server/usb/UsbUserPermissionManager.java

@@ -688,6 +688,8 @@ class UsbUserPermissionManager {
             String packageName,
             PendingIntent pi,
             int uid) {
+        boolean throwException = false;
+
         // compare uid with packageName to foil apps pretending to be someone else
         try {
             ApplicationInfo aInfo = mContext.getPackageManager().getApplicationInfo(packageName, 0);
@@ -695,11 +697,13 @@ class UsbUserPermissionManager {
                 Slog.w(TAG, "package " + packageName
                         + " does not match caller's uid " + uid);
                 EventLog.writeEvent(SNET_EVENT_LOG_ID, "180104273", -1, "");
-                throw new IllegalArgumentException("package " + packageName
-                        + " not found");
+                throwException = true;
             }
         } 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);