release-request-6cbfca23-53b9-4640-81ff-6473eaf433a5-for-git_oc-dr1-release-42... (1eef63be) · Commits · e / os / android_packages_apps_Bluetooth

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,7 @@ public class AdapterService extends Service {
		public static final String BLUETOOTH_PRIVILEGED =
		android.Manifest.permission.BLUETOOTH_PRIVILEGED;
		static final String BLUETOOTH_PERM = android.Manifest.permission.BLUETOOTH;
		static final String LOCAL_MAC_ADDRESS_PERM = android.Manifest.permission.LOCAL_MAC_ADDRESS;
		static final String RECEIVE_MAP_PERM = android.Manifest.permission.RECEIVE_BLUETOOTH_MAP;

		private static final String PHONEBOOK_ACCESS_PERMISSION_PREFERENCE_FILE =
		@@ -1438,6 +1439,7 @@ public class AdapterService extends Service {

		String getAddress() {
		enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
		enforceCallingOrSelfPermission(LOCAL_MAC_ADDRESS_PERM, "Need LOCAL_MAC_ADDRESS permission");

		String addrString = null;
		byte[] address = mAdapterProperties.getAddress();

src/com/android/bluetooth/btservice/RemoteDevices.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -513,7 +513,8 @@ final class RemoteDevices {
		BluetoothDevice device = getDevice(address);

		if (device == null) {
		errorLog("aclStateChangeCallback: Device is NULL");
		errorLog("aclStateChangeCallback: device is NULL, address="
		+ Utils.getAddressStringFromByte(address) + ", newState=" + newState);
		return;
		}
		int state = mAdapterService.getState();

src/com/android/bluetooth/gatt/AppScanStats.java

+20 −20

Original line number	Diff line number	Diff line
		@@ -157,15 +157,13 @@ import com.android.bluetooth.btservice.BluetoothProto;
		scanEvent.setInitiator(truncateAppName(appName));
		gattService.addScanEvent(scanEvent);

		if (!isScanning()) {
		if (!isScanning()) mScanStartTime = startTime;
		try {
		boolean isUnoptimized = !(scan.filtered \|\| scan.background \|\| scan.opportunistic);
		mScanStartTime = startTime;
		batteryStats.noteBleScanStarted(workSource, isUnoptimized);
		} catch (RemoteException e) {
		/* ignore */
		}
		}

		ongoingScans.put(scannerId, scan);
		}
		@@ -193,20 +191,22 @@ import com.android.bluetooth.btservice.BluetoothProto;
		gattService.addScanEvent(scanEvent);

		if (!isScanning()) {
		try {
		long totalDuration = stopTime - mScanStartTime;
		mTotalScanTime += totalDuration;
		minScanTime = Math.min(totalDuration, minScanTime);
		maxScanTime = Math.max(totalDuration, maxScanTime);
		}

		try {
		// Inform battery stats of any results it might be missing on
		// scan stop
		boolean isUnoptimized = !(scan.filtered \|\| scan.background \|\| scan.opportunistic);
		batteryStats.noteBleScanResults(workSource, scan.results % 100);
		batteryStats.noteBleScanStopped(workSource);
		batteryStats.noteBleScanStopped(workSource, isUnoptimized);
		} catch (RemoteException e) {
		/* ignore */
		}
		}
		}

		synchronized void setScanTimeout(int scannerId) {
		if (!isScanning()) return;

src/com/android/bluetooth/hfp/HeadsetService.java

+11 −8

Original line number	Diff line number	Diff line
		@@ -352,30 +352,34 @@ public class HeadsetService extends ProfileService {

		public boolean connect(BluetoothDevice device) {
		enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH ADMIN permission");

		Log.d(TAG, "connect: device=" + device);
		if (getPriority(device) == BluetoothProfile.PRIORITY_OFF) {
		Log.w(TAG, "connect: PRIORITY_OFF, device=" + device);
		return false;
		}

		int connectionState = mStateMachine.getConnectionState(device);
		Log.d(TAG, "connectionState = " + connectionState);
		if (connectionState == BluetoothProfile.STATE_CONNECTED
		\|\| connectionState == BluetoothProfile.STATE_CONNECTING) {
		Log.w(TAG,
		"connect: already connected/connecting, connectionState=" + connectionState
		+ ", device=" + device);
		return false;
		}

		mStateMachine.sendMessage(HeadsetStateMachine.CONNECT, device);
		return true;
		}

		boolean disconnect(BluetoothDevice device) {
		enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH ADMIN permission");
		Log.d(TAG, "disconnect: device=" + device);
		int connectionState = mStateMachine.getConnectionState(device);
		if (connectionState != BluetoothProfile.STATE_CONNECTED
		&& connectionState != BluetoothProfile.STATE_CONNECTING) {
		Log.w(TAG,
		"disconnect: not connected/connecting, connectionState=" + connectionState
		+ ", device=" + device);
		return false;
		}

		mStateMachine.sendMessage(HeadsetStateMachine.DISCONNECT, device);
		return true;
		}
		@@ -483,12 +487,11 @@ public class HeadsetService extends ProfileService {
		// TODO(BT) BLUETOOTH or BLUETOOTH_ADMIN permission
		enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
		if (!mStateMachine.isConnected()) {
		return false;
		}
		if (!mStateMachine.isSlcConnected()) {
		Log.w(TAG, "connectAudio: profile not connected");
		return false;
		}
		if (mStateMachine.isAudioOn()) {
		Log.w(TAG, "connectAudio: audio is already ON");
		return false;
		}
		mStateMachine.sendMessage(HeadsetStateMachine.CONNECT_AUDIO);

src/com/android/bluetooth/hfp/HeadsetStateMachine.java

+298 −357

File changed.

Preview size limit exceeded, changes collapsed.