Merge "SAP: set priority after user confirm access permission" (2fc4c734) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/sap/SapService.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -782,8 +782,9 @@ public class SapService extends ProfileService {

		if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY)) {
		Log.v(TAG, " - Received BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY");
		if (!mIsWaitingAuthorization) {
		// this reply is not for us

		int requestType = intent.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, -1);
		if (requestType != BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
		return;
		}

		@@ -800,6 +801,9 @@ public class SapService extends ProfileService {
		Log.v(TAG, "setSimAccessPermission(ACCESS_ALLOWED) result=" + result);
		}
		}
		boolean result = setPriority(mRemoteDevice, BluetoothProfile.PRIORITY_ON);
		Log.d(TAG, "setPriority ON, result = " + result);

		try {
		if (mConnSocket != null) {
		// start obex server and rfcomm connection
		@@ -818,6 +822,8 @@ public class SapService extends ProfileService {
		Log.v(TAG, "setSimAccessPermission(ACCESS_REJECTED) result=" + result);
		}
		}
		boolean result = setPriority(mRemoteDevice, BluetoothProfile.PRIORITY_OFF);
		Log.d(TAG, "setPriority OFF, result = " + result);
		// Ensure proper cleanup, and prepare for new connect.
		mSessionStatusHandler.sendEmptyMessage(MSG_SERVERSESSION_CLOSE);
		}