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

am 1263deb9: Merge "Allow system server to bind to USB devices." into jb-mr2-dev

Browse Source 
* commit '1263deb936e02c9f6045ace42ebb3abbb64625a9':
  Allow system server to bind to USB devices.
This commit is contained in:
Jeff Brown
2013-03-28 11:57:59 -07:00
committed by Android Git Automerger
parent bdecb57497 1263deb936
commit 0c454a0a7a
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/java/com/android/server/usb/UsbSettingsManager.java
View File

@@ -34,6 +34,7 @@ import android.hardware.usb.UsbInterface;
import android.hardware.usb.UsbManager;
import android.os.Binder;
import android.os.Environment;
import android.os.Process;
import android.os.UserHandle;
import android.util.AtomicFile;
import android.util.Log;
@@ -853,21 +854,29 @@ class UsbSettingsManager {
public boolean hasPermission(UsbDevice device) {
synchronized (mLock) {
int uid = Binder.getCallingUid();
if (uid == Process.SYSTEM_UID) {
return true;
}
SparseBooleanArray uidList = mDevicePermissionMap.get(device.getDeviceName());
if (uidList == null) {
return false;
}
return uidList.get(Binder.getCallingUid());
return uidList.get(uid);
}
}
public boolean hasPermission(UsbAccessory accessory) {
synchronized (mLock) {
int uid = Binder.getCallingUid();
if (uid == Process.SYSTEM_UID) {
return true;
}
SparseBooleanArray uidList = mAccessoryPermissionMap.get(accessory);
if (uidList == null) {
return false;
}
return uidList.get(Binder.getCallingUid());
return uidList.get(uid);
}
}