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

Commit 72b5c459 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "Check USB device/accessory perms with sys identity" into qt-dev am:... 

Merge "Check USB device/accessory perms with sys identity" into qt-dev am: 518525fa am: abc14683
am: f31d57a9

Change-Id: Ib126e0e4307c7c7d3ff6bff35f3ad964c622c26a
parents 61831975 f31d57a9

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

+12 −12
Original line number Diff line number Diff line
@@ -85,9 +85,6 @@ class UsbSerialReader extends IUsbSerialReader.Stub { 
                    throw new RemoteException("package " + packageName + " cannot be found");

                }

                packageTargetSdkVersion = pkg.applicationInfo.targetSdkVersion;

            } finally {

                Binder.restoreCallingIdentity(token);

            }



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

                    if (mContext.checkPermission(android.Manifest.permission.MANAGE_USB, pid, uid)
@@ -102,6 +99,9 @@ class UsbSerialReader extends IUsbSerialReader.Stub { 
                        }

                    }

                }

            } finally {

                Binder.restoreCallingIdentity(token);

            }

        }



        return mSerialNumber;