Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 518525fa78

Change-Id: Ief066e626e1a9b906d982ed44512edceed733255
This commit is contained in:
Philip P. Moltmann
2019-05-28 13:46:49 -07:00
committed by android-build-merger
parent aba815ad15 518525fa78
commit abc1468350
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/usb/java/com/android/server/usb/UsbSerialReader.java
View File

@@ -85,22 +85,22 @@ 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)
== PackageManager.PERMISSION_DENIED) {
UsbUserSettingsManager settings = mSettingsManager.getSettingsForUser(
UserHandle.getUserId(uid));
if (packageTargetSdkVersion >= Build.VERSION_CODES.Q) {
if (mContext.checkPermission(android.Manifest.permission.MANAGE_USB, pid, uid)
== PackageManager.PERMISSION_DENIED) {
UsbUserSettingsManager settings = mSettingsManager.getSettingsForUser(
UserHandle.getUserId(uid));
if (mDevice instanceof UsbDevice) {
settings.checkPermission((UsbDevice) mDevice, packageName, uid);
} else {
settings.checkPermission((UsbAccessory) mDevice, uid);
if (mDevice instanceof UsbDevice) {
settings.checkPermission((UsbDevice) mDevice, packageName, uid);
} else {
settings.checkPermission((UsbAccessory) mDevice, uid);
}
}
}
} finally {
Binder.restoreCallingIdentity(token);
}
}