Fixed issue with getting Bluetooth adapter's name and airplane mode (116d1d46) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothAdapter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -584,7 +584,7 @@ public final class BluetoothAdapter {
		*/
		public String getName() {
		try {
		return mService.getName();
		return mManagerService.getName();
		} catch (RemoteException e) {Log.e(TAG, "", e);}
		return null;
		}

services/java/com/android/server/BluetoothManagerService.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		mCallbacks = new ArrayList<IBluetoothManagerCallback>();
		mStateChangeCallbacks = new ArrayList<IBluetoothStateChangeCallback>();
		IntentFilter mFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
		mFilter.addAction(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);
		registerForAirplaneMode(mFilter);
		mContext.registerReceiver(mReceiver, mFilter);
		boolean airplaneModeOn = isAirplaneModeOn();
		@@ -294,6 +295,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		}
		if (!isConnected()) mBinding = true;
		}

		Message msg = mHandler.obtainMessage(MESSAGE_ENABLE);
		msg.arg1=1; //persist
		mHandler.sendMessage(msg);
		@@ -342,12 +344,30 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		public String getAddress() {
		mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,
		"Need BLUETOOTH ADMIN permission");
		synchronized(mConnection) {
		if (mBluetooth != null) {
		try {
		return mBluetooth.getAddress();
		} catch (RemoteException e) {
		Log.e(TAG, "getAddress(): Unable to retrieve address remotely..Returning cached address",e);
		}
		}
		}
		return mAddress;
		}

		public String getName() {
		mContext.enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM,
		"Need BLUETOOTH ADMIN permission");
		synchronized(mConnection) {
		if (mBluetooth != null) {
		try {
		return mBluetooth.getName();
		} catch (RemoteException e) {
		Log.e(TAG, "getName(): Unable to retrieve name remotely..Returning cached name",e);
		}
		}
		}
		return mName;
		}