Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fbbac52 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "USB: Adjust exception message in dealing with permission check #3" into... 

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

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

Change-Id: Iafde993260e85c53382726b2130f9c933fb7f453
parents c1fb3e20 6008fe79

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

+7 −3
Original line number Diff line number Diff line
@@ -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,10 +697,12 @@ 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) {

            throwException = true;

        } finally {

            if (throwException)

                throw new IllegalArgumentException("package " + packageName + " not found");

        }