resolve merge conflicts of 5feadc6 to stage-aosp-master (45d205f1) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothAdapter.java

+60 −76

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.annotation.RequiresPermission;
		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.annotation.SystemApi;
		import android.app.ActivityThread;
		import android.bluetooth.le.BluetoothLeAdvertiser;
		import android.bluetooth.le.BluetoothLeScanner;
		import android.bluetooth.le.ScanCallback;
		@@ -271,6 +272,29 @@ public final class BluetoothAdapter {
		public static final String ACTION_REQUEST_ENABLE =
		"android.bluetooth.adapter.action.REQUEST_ENABLE";

		/**
		* Activity Action: Show a system activity that allows the user to turn off
		* Bluetooth. This is used only if permission review is enabled which is for
		* apps targeting API less than 23 require a permission review before any of
		* the app's components can run.
		* <p>This system activity will return once Bluetooth has completed turning
		* off, or the user has decided not to turn Bluetooth off.
		* <p>Notification of the result of this activity is posted using the
		* {@link android.app.Activity#onActivityResult} callback. The
		* <code>resultCode</code>
		* will be {@link android.app.Activity#RESULT_OK} if Bluetooth has been
		* turned off or {@link android.app.Activity#RESULT_CANCELED} if the user
		* has rejected the request or an error has occurred.
		* <p>Applications can also listen for {@link #ACTION_STATE_CHANGED}
		* for global notification whenever Bluetooth is turned on or off.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		*
		* @hide
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_REQUEST_DISABLE =
		"android.bluetooth.adapter.action.REQUEST_DISABLE";

		/**
		* Activity Action: Show a system activity that allows user to enable BLE scans even when
		* Bluetooth is turned off.<p>
		@@ -656,30 +680,7 @@ public final class BluetoothAdapter {
		}

		/**
		* Performs action based on user action to turn BT ON
		* or OFF if BT is in BLE_ON state
		*/
		private void notifyUserAction(boolean enable) {
		try {
		mServiceLock.readLock().lock();
		if (mService == null) {
		Log.e(TAG, "mService is null");
		return;
		}
		if (enable) {
		mService.onLeServiceUp(); //NA:TODO implementation pending
		} else {
		mService.onBrEdrDown(); //NA:TODO implementation pending
		}
		} catch (RemoteException e) {
		Log.e(TAG, "", e);
		} finally {
		mServiceLock.readLock().unlock();
		}
		}

		/**
		* Turns off Bluetooth LE which was earlier turned on by calling EnableBLE().
		* Turns off Bluetooth LE which was earlier turned on by calling enableBLE().
		*
		* <p> If the internal Adapter state is STATE_BLE_ON, this would trigger the transition
		* to STATE_OFF and completely shut-down Bluetooth
		@@ -709,61 +710,50 @@ public final class BluetoothAdapter {
		if (!isBleScanAlwaysAvailable()) return false;

		int state = getLeState();
		if (state == BluetoothAdapter.STATE_ON) {
		if (DBG) Log.d (TAG, "STATE_ON: shouldn't disable");
		if (state == BluetoothAdapter.STATE_ON \|\| state == BluetoothAdapter.STATE_BLE_ON) {
		String packageName = ActivityThread.currentPackageName();
		if (DBG) Log.d (TAG, "disableBLE(): de-registering " + packageName);
		try {
		mManagerService.updateBleAppCount(mToken, false);
		mManagerService.updateBleAppCount(mToken, false, packageName);
		} catch (RemoteException e) {
		Log.e(TAG, "", e);
		}
		return true;

		} else if (state == BluetoothAdapter.STATE_BLE_ON) {
		if (DBG) Log.d (TAG, "STATE_BLE_ON");
		int bleAppCnt = 0;
		try {
		bleAppCnt = mManagerService.updateBleAppCount(mToken, false);
		} catch (RemoteException e) {
		Log.e(TAG, "", e);
		}
		if (bleAppCnt == 0) {
		// Disable only if there are no other clients
		notifyUserAction(false);
		}
		return true;
		}

		if (DBG) Log.d (TAG, "STATE_OFF: Already disabled");
		if (DBG) Log.d (TAG, "disableBLE(): Already disabled");
		return false;
		}

		/**
		* Special Applications who want to only turn on Bluetooth Low Energy (BLE) would
		* EnableBLE, EnableBLE brings-up Bluetooth so that application can access
		* only LE related feature (Bluetooth GATT layers interfaces using the respective class)
		* EnableBLE in turn registers the existance of a special App which wants to
		* turn on Bluetooth Low enrgy part without making it visible at the settings UI
		* as Bluetooth ON.
		* <p>Invoking EnableBLE when Bluetooth is already in ON state, would just registers
		* the existance of special Application and doesn't do anything to current BT state.
		* when user turn OFF Bluetooth from UI, if there is an existance of special app, Bluetooth
		* would stay in BLE_ON state so that LE features are still acessible to the special
		* Applications.
		* Applications who want to only use Bluetooth Low Energy (BLE) can call enableBLE.
		*
		* <p>This is an asynchronous call: it will return immediately, and
		* enableBLE registers the existence of an app using only LE functions.
		*
		* enableBLE may enable Bluetooth to an LE only mode so that an app can use
		* LE related features (BluetoothGatt or BluetoothGattServer classes)
		*
		* If the user disables Bluetooth while an app is registered to use LE only features,
		* Bluetooth will remain on in LE only mode for the app.
		*
		* When Bluetooth is in LE only mode, it is not shown as ON to the UI.
		*
		* <p>This is an asynchronous call: it returns immediately, and
		* clients should listen for {@link #ACTION_BLE_STATE_CHANGED}
		* to be notified of subsequent adapter state changes. If this call returns
		* true, then the adapter state will immediately transition from {@link
		* #STATE_OFF} to {@link #STATE_BLE_TURNING_ON}, and some time
		* later transition to either {@link #STATE_OFF} or {@link
		* #STATE_BLE_ON}. If this call returns false then there was an
		* immediate problem that will prevent the adapter from being turned on -
		* such as Airplane mode, or the adapter is already turned on.
		* (@link #ACTION_BLE_STATE_CHANGED) returns the Bluetooth Adapter's various
		* to be notified of adapter state changes.
		*
		* If this call returns * true, then the adapter state is either in a mode where
		* LE is available, or will transition from {@link #STATE_OFF} to {@link #STATE_BLE_TURNING_ON},
		* and some time later transition to either {@link #STATE_OFF} or {@link #STATE_BLE_ON}.
		*
		* If this call returns false then there was an immediate problem that prevents the
		* adapter from being turned on - such as Airplane mode.
		*
		* {@link #ACTION_BLE_STATE_CHANGED} returns the Bluetooth Adapter's various
		* states, It includes all the classic Bluetooth Adapter states along with
		* internal BLE only states
		*
		* @return true to indicate Bluetooth LE start-up has begun, or false on
		* @return true to indicate Bluetooth LE will be available, or false on
		* immediate error
		* @hide
		*/
		@@ -772,13 +762,14 @@ public final class BluetoothAdapter {
		if (!isBleScanAlwaysAvailable()) return false;

		try {
		mManagerService.updateBleAppCount(mToken, true);
		String packageName = ActivityThread.currentPackageName();
		mManagerService.updateBleAppCount(mToken, true, packageName);
		if (isLeEnabled()) {
		if (DBG) Log.d(TAG, "enableBLE(): Bluetooth already enabled");
		return true;
		}
		if (DBG) Log.d(TAG, "enableBLE(): Calling enable");
		return mManagerService.enable();
		return mManagerService.enable(packageName);
		} catch (RemoteException e) {
		Log.e(TAG, "", e);
		}
		@@ -905,7 +896,7 @@ public final class BluetoothAdapter {
		return true;
		}
		try {
		return mManagerService.enable();
		return mManagerService.enable(ActivityThread.currentPackageName());
		} catch (RemoteException e) {Log.e(TAG, "", e);}
		return false;
		}
		@@ -937,7 +928,7 @@ public final class BluetoothAdapter {
		@RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
		public boolean disable() {
		try {
		return mManagerService.disable(true);
		return mManagerService.disable(ActivityThread.currentPackageName(), true);
		} catch (RemoteException e) {Log.e(TAG, "", e);}
		return false;
		}
		@@ -955,7 +946,7 @@ public final class BluetoothAdapter {
		public boolean disable(boolean persist) {

		try {
		return mManagerService.disable(persist);
		return mManagerService.disable(ActivityThread.currentPackageName(), persist);
		} catch (RemoteException e) {Log.e(TAG, "", e);}
		return false;
		}
		@@ -1916,9 +1907,6 @@ public final class BluetoothAdapter {
		} else if (profile == BluetoothProfile.MAP_CLIENT) {
		BluetoothMapClient mapClient = new BluetoothMapClient(context, listener);
		return true;
		} else if (profile == BluetoothProfile.INPUT_HOST) {
		BluetoothInputHost iHost = new BluetoothInputHost(context, listener);
		return true;
		} else {
		return false;
		}
		@@ -1995,10 +1983,6 @@ public final class BluetoothAdapter {
		BluetoothMapClient mapClient = (BluetoothMapClient)proxy;
		mapClient.close();
		break;
		case BluetoothProfile.INPUT_HOST:
		BluetoothInputHost iHost = (BluetoothInputHost) proxy;
		iHost.close();
		break;
		}
		}

		@@ -2070,7 +2054,7 @@ public final class BluetoothAdapter {
		return true;
		}
		try {
		return mManagerService.enableNoAutoConnect();
		return mManagerService.enableNoAutoConnect(ActivityThread.currentPackageName());
		} catch (RemoteException e) {Log.e(TAG, "", e);}
		return false;
		}

framework/java/android/bluetooth/IBluetoothManager.aidl

+3 −3

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ interface IBluetoothManager
		void unregisterStateChangeCallback(in IBluetoothStateChangeCallback callback);
		boolean isEnabled();
		boolean enable(String packageName);
		boolean enableNoAutoConnect();
		boolean enableNoAutoConnect(String packageName);
		boolean disable(String packageName, boolean persist);
		int getState();
		IBluetoothGatt getBluetoothGatt();
		@@ -47,6 +47,6 @@ interface IBluetoothManager
		String getName();

		boolean isBleScanAlwaysAvailable();
		int updateBleAppCount(IBinder b, boolean enable);
		int updateBleAppCount(IBinder b, boolean enable, String packageName);
		boolean isBleAppPresent();
		}

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+200 −64

File changed.

Preview size limit exceeded, changes collapsed.