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

Commit d530d102 authored by Pavel Maltsev's avatar Pavel Maltsev
Browse files

Fix security exception when reading usb serial num 

Bug: 117881221
Test: run projection on mojave board
Change-Id: Ife4c5e18b6d8f7c20b363f40119dfefd8ab008ef
parent 325dd4b6

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

+12 −5
Original line number Diff line number Diff line
@@ -75,14 +75,21 @@ class UsbSerialReader extends IUsbSerialReader.Stub { 
        if (uid != Process.SYSTEM_UID) {

            enforcePackageBelongsToUid(uid, packageName);



            int packageTargetSdkVersion;

            long token = Binder.clearCallingIdentity();

            try {

                PackageInfo pkg;

                try {

                    pkg = mContext.getPackageManager().getPackageInfo(packageName, 0);

                } catch (PackageManager.NameNotFoundException e) {

                    throw new RemoteException("package " + packageName + " cannot be found");

                }

                packageTargetSdkVersion = pkg.applicationInfo.targetSdkVersion;

            } finally {

                Binder.restoreCallingIdentity(token);

            }



            if (pkg.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.Q) {

            if (packageTargetSdkVersion >= Build.VERSION_CODES.Q) {

                if (mContext.checkPermission(android.Manifest.permission.MANAGE_USB, pid, uid)

                        == PackageManager.PERMISSION_DENIED) {

                    UsbUserSettingsManager settings = mSettingsManager.getSettingsForUser(