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

am b1a01ab0: Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev

Browse Source 
* commit 'b1a01ab01c2aa5136f7781c3a6ec682590e38ac4':
  Allow the NFC process to call Bluetooth APIs.
This commit is contained in:
Martijn Coenen
2012-11-30 11:09:43 -08:00
committed by Android Git Automerger
parent 1bd7d5e47e b1a01ab01c
commit f77445cd48
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/java/com/android/server/BluetoothManagerService.java
View File

@@ -43,8 +43,6 @@ import android.os.SystemClock;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.util.Log; import android.util.Log;
import java.util.ArrayList;
import java.util.List;
class BluetoothManagerService extends IBluetoothManager.Stub { class BluetoothManagerService extends IBluetoothManager.Stub {
private static final String TAG = "BluetoothManagerService"; private static final String TAG = "BluetoothManagerService";
private static final boolean DBG = true; private static final boolean DBG = true;
@@ -330,9 +328,12 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
Log.d(TAG,"enableNoAutoConnect(): mBluetooth =" + mBluetooth + Log.d(TAG,"enableNoAutoConnect(): mBluetooth =" + mBluetooth +
" mBinding = " + mBinding); " mBinding = " + mBinding);
} }
if (Binder.getCallingUid() != Process.NFC_UID) { int callingAppId = UserHandle.getAppId(Binder.getCallingUid());
if (callingAppId != Process.NFC_UID) {
throw new SecurityException("no permission to enable Bluetooth quietly"); throw new SecurityException("no permission to enable Bluetooth quietly");
} }
Message msg = mHandler.obtainMessage(MESSAGE_ENABLE); Message msg = mHandler.obtainMessage(MESSAGE_ENABLE);
msg.arg1=0; //No persist msg.arg1=0; //No persist
msg.arg2=1; //Quiet mode msg.arg2=1; //Quiet mode
@@ -968,11 +969,14 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
private boolean checkIfCallerIsForegroundUser() { private boolean checkIfCallerIsForegroundUser() {
int foregroundUser; int foregroundUser;
int callingUser = UserHandle.getCallingUserId(); int callingUser = UserHandle.getCallingUserId();
int callingUid = Binder.getCallingUid();
long callingIdentity = Binder.clearCallingIdentity(); long callingIdentity = Binder.clearCallingIdentity();
int callingAppId = UserHandle.getAppId(callingUid);
boolean valid = false; boolean valid = false;
try { try {
foregroundUser = ActivityManager.getCurrentUser(); foregroundUser = ActivityManager.getCurrentUser();
valid = (callingUser == foregroundUser); valid = (callingUser == foregroundUser) ||
callingAppId == Process.NFC_UID;
if (DBG) { if (DBG) {
Log.d(TAG, "checkIfCallerIsForegroundUser: valid=" + valid Log.d(TAG, "checkIfCallerIsForegroundUser: valid=" + valid
+ " callingUser=" + callingUser + " callingUser=" + callingUser