drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge " BluetoothManagerService call should allow SYSTEM_UID" into jb-mr1.1-dev

Browse Source
This commit is contained in:
Zhihai Xu
2012-11-29 16:03:46 -08:00
committed by Android (Google) Code Review
parent 818b2f341c 6eb7652b04
commit e1a867f68d
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,8 +297,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
}
public boolean isEnabled() {
if (!checkIfCallerIsForegroundUser()) {
Log.w(TAG,"isEnabled(): not allowed for non-active user");
if ((Binder.getCallingUid() != Process.SYSTEM_UID) &&
(!checkIfCallerIsForegroundUser())) {
Log.w(TAG,"isEnabled(): not allowed for non-active and non system user");
return false;
}
@ -325,11 +326,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,
"Need BLUETOOTH ADMIN permission");
if (!checkIfCallerIsForegroundUser()) {
Log.w(TAG,"enableNoAutoConnect(): not allowed for non-active user");
return false;
}
if (DBG) {
Log.d(TAG,"enableNoAutoConnect(): mBluetooth =" + mBluetooth +
" mBinding = " + mBinding);
@ -345,8 +341,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
}
public boolean enable() {
if (!checkIfCallerIsForegroundUser()) {
Log.w(TAG,"enable(): not allowed for non-active user");
if ((Binder.getCallingUid() != Process.SYSTEM_UID) &&
(!checkIfCallerIsForegroundUser())) {
Log.w(TAG,"enable(): not allowed for non-active and non system user");
return false;
}
@ -357,8 +354,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,
"Need BLUETOOTH ADMIN permissicacheNameAndAddresson");
if (!checkIfCallerIsForegroundUser()) {
Log.w(TAG,"disable(): not allowed for non-active user");
if ((Binder.getCallingUid() != Process.SYSTEM_UID) &&
(!checkIfCallerIsForegroundUser())) {
Log.w(TAG,"disable(): not allowed for non-active and non system user");
return false;
}
@ -456,9 +454,10 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,
"Need BLUETOOTH ADMIN permission");
if (!checkIfCallerIsForegroundUser()) {
Log.w(TAG,"getAddress(): not allowed for non-active user");
return mAddress;
if ((Binder.getCallingUid() != Process.SYSTEM_UID) &&
(!checkIfCallerIsForegroundUser())) {
Log.w(TAG,"getAddress(): not allowed for non-active and non system user");
return null;
}
synchronized(mConnection) {
@ -480,9 +479,10 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,
"Need BLUETOOTH ADMIN permission");
if (!checkIfCallerIsForegroundUser()) {
Log.w(TAG,"getName(): not allowed for non-active user");
return mName;
if ((Binder.getCallingUid() != Process.SYSTEM_UID) &&
(!checkIfCallerIsForegroundUser())) {
Log.w(TAG,"getName(): not allowed for non-active and non system user");
return null;
}
synchronized(mConnection) {