diff options
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbUserSettingsManager.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbUserSettingsManager.java b/services/usb/java/com/android/server/usb/UsbUserSettingsManager.java index 0121d30736c2..84add88cc84c 100644 --- a/services/usb/java/com/android/server/usb/UsbUserSettingsManager.java +++ b/services/usb/java/com/android/server/usb/UsbUserSettingsManager.java @@ -40,7 +40,6 @@ import android.hardware.usb.UsbConstants; import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbInterface; import android.hardware.usb.UsbManager; -import android.os.Binder; import android.os.UserHandle; import android.service.usb.UsbAccessoryAttachedActivities; import android.service.usb.UsbDeviceAttachedActivities; @@ -190,9 +189,8 @@ class UsbUserSettingsManager { @Nullable UsbAccessory accessory, boolean canBeDefault, String packageName, - PendingIntent pi) { - final int uid = Binder.getCallingUid(); - + PendingIntent pi, + int uid) { // compare uid with packageName to foil apps pretending to be someone else try { ApplicationInfo aInfo = mPackageManager.getApplicationInfo(packageName, 0); @@ -235,7 +233,8 @@ class UsbUserSettingsManager { } } - requestPermissionDialog(device, null, canBeDefault(device, packageName), packageName, pi); + requestPermissionDialog(device, null, canBeDefault(device, packageName), packageName, pi, + uid); } public void requestPermission(UsbAccessory accessory, String packageName, PendingIntent pi, @@ -253,8 +252,8 @@ class UsbUserSettingsManager { return; } - requestPermissionDialog(null, accessory, - canBeDefault(accessory, packageName), packageName, pi); + requestPermissionDialog(null, accessory, canBeDefault(accessory, packageName), packageName, + pi, uid); } public void grantDevicePermission(UsbDevice device, int uid) { |