Merge "Remove IBluetooth.sendConnectionStateChanged" am: f30b45f84d (b64edfd9) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+0 −21

Original line number	Diff line number	Diff line
		@@ -1771,16 +1771,6 @@ public class AdapterService extends Service {
		return service.setSimAccessPermission(device, value);
		}

		@Override
		public void sendConnectionStateChange(BluetoothDevice device, int profile, int state,
		int prevState) {
		AdapterService service = getService();
		if (service == null) {
		return;
		}
		service.sendConnectionStateChange(device, profile, state, prevState);
		}

		@Override
		public IBluetoothSocketManager getSocketManager() {
		AdapterService service = getService();
		@@ -2859,17 +2849,6 @@ public class AdapterService extends Service {
		return true;
		}

		void sendConnectionStateChange(BluetoothDevice device, int profile, int state, int prevState) {
		// TODO(BT) permission check?
		// Since this is a binder call check if Bluetooth is on still
		if (getState() == BluetoothAdapter.STATE_OFF) {
		return;
		}

		mAdapterProperties.sendConnectionStateChange(device, profile, state, prevState);

		}

		IBluetoothSocketManager getSocketManager() {
		return IBluetoothSocketManager.Stub.asInterface(mBluetoothSocketManagerBinder);
		}