MAP: Perform MAS create SDP records from Handler. (d236fa25) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/map/BluetoothMapMasInstance.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -148,7 +148,8 @@ public class BluetoothMapMasInstance implements IObexConnectionHandler {

		@Override
		public String toString() {
		return "MasId: " + mMasInstanceId + " Uri:" + mBaseUri + " SMS/MMS:" + mEnableSmsMms;
		return "MasId: " + mMasInstanceId + " Uri:" + mBaseUri + " Is Enable SMS/MMS? :"
		+ mEnableSmsMms;
		}

		private void init() {

src/com/android/bluetooth/map/BluetoothMapService.java

+69 −30

Original line number	Diff line number	Diff line
		@@ -114,7 +114,8 @@ public class BluetoothMapService extends ProfileService {

		private PowerManager.WakeLock mWakeLock = null;

		private static final int UPDATE_MAS_INSTANCES = 5;
		private static final int CREATE_MAS_INSTANCES = 5;
		private static final int UPDATE_MAS_INSTANCES = 6;

		public static final int UPDATE_MAS_INSTANCES_ACCOUNT_ADDED = 0;
		public static final int UPDATE_MAS_INSTANCES_ACCOUNT_REMOVED = 1;
		@@ -348,14 +349,27 @@ public class BluetoothMapService extends ProfileService {
		}

		private final class MapServiceMessageHandler extends Handler {
		private MapServiceMessageHandler(Looper looper) {
		Context mContxt;
		private MapServiceMessageHandler(Context contxt, Looper looper) {
		super(looper);
		mContxt = contxt;
		}
		@Override
		public void handleMessage(Message msg) {
		if (DEBUG) Log.d(TAG, "Handler(): got msg=" + msg.what);

		switch (msg.what) {
		case CREATE_MAS_INSTANCES:
		Log.d(TAG, "CREATE_MAS_INSTANCES ");
		mAppObserver =
		new BluetoothMapAppObserver(mContxt, (BluetoothMapService)mContxt);
		if (mAppObserver != null ) {
		mEnabledAccounts = mAppObserver.getEnabledAccountItems();
		}
		/** Uses mEnabledAccounts, hence getEnabledAccountItems()
		* must be called before this. */
		createMasInstances();
		break;
		case UPDATE_MAS_INSTANCES:
		updateMasInstancesHandler();
		break;
		@@ -613,7 +627,7 @@ public class BluetoothMapService extends ProfileService {
		HandlerThread thread = new HandlerThread("BluetoothMapHandler");
		thread.start();
		Looper looper = thread.getLooper();
		mSessionStatusHandler = new MapServiceMessageHandler(looper);
		mSessionStatusHandler = new MapServiceMessageHandler(this, looper);

		if(!VERBOSE)
		VERBOSE = Log.isLoggable(LOG_TAG, Log.VERBOSE);
		@@ -647,15 +661,10 @@ public class BluetoothMapService extends ProfileService {
		}
		}
		mAdapter = BluetoothAdapter.getDefaultAdapter();
		mAppObserver = new BluetoothMapAppObserver(this, this);

		mEnabledAccounts = mAppObserver.getEnabledAccountItems();

		mSmsCapable = getResources().getBoolean(
		com.android.internal.R.bool.config_sms_capable);
		// Uses mEnabledAccounts, hence getEnabledAccountItems() must be called before this.
		createMasInstances();

		// Move SDP records create to Handler Thread instead of main thread.
		sendCreateMasInstances();
		// start RFCOMM listener
		sendStartListenerMessage(-1);
		mStartError = false;
		@@ -694,7 +703,10 @@ public class BluetoothMapService extends ProfileService {
		private boolean updateMasInstancesHandler(){
		if (DEBUG) Log.d(TAG,"updateMasInstancesHandler() state = " + getState());
		boolean changed = false;

		if (mAppObserver == null) {
		Log.w( TAG, "updateMasInstancesHandler: NoAppObeserver Found");
		return changed;
		}
		ArrayList<BluetoothMapAccountItem> newAccountList =
		mAppObserver.getEnabledAccountItems();
		ArrayList<BluetoothMapAccountItem> newAccounts = null;
		@@ -702,12 +714,13 @@ public class BluetoothMapService extends ProfileService {
		newAccounts = new ArrayList<BluetoothMapAccountItem>();
		removedAccounts = mEnabledAccounts; // reuse the current enabled list, to track removed
		// accounts
		if (newAccountList != null) {
		for (BluetoothMapAccountItem account: newAccountList) {
		if(!removedAccounts.remove(account)) {
		if (removedAccounts != null && !removedAccounts.remove(account)) {
		newAccounts.add(account);
		}
		}

		}
		if(removedAccounts != null) {
		/* Remove all disabled/removed accounts */
		for(BluetoothMapAccountItem account : removedAccounts) {
		@@ -801,6 +814,7 @@ public class BluetoothMapService extends ProfileService {
		mMasInstanceMap.put(null, smsMmsInst);
		}

		if (mEnabledAccounts != null) {
		// get list of accounts already set to be visible through MAP
		for (BluetoothMapAccountItem account : mEnabledAccounts) {
		masId++; // SMS/MMS is masId=0, increment before adding next
		@@ -814,6 +828,7 @@ public class BluetoothMapService extends ProfileService {
		mMasInstanceMap.put(account, newInst);
		}
		}
		}

		@Override
		protected boolean stop() {
		@@ -822,7 +837,9 @@ public class BluetoothMapService extends ProfileService {
		try {
		mRegisteredMapReceiver = false;
		unregisterReceiver(mMapReceiver);
		if (mAppObserver != null) {
		mAppObserver.shutdown();
		}
		} catch (Exception e) {
		Log.e(TAG,"Unable to unregister map receiver",e);
		}
		@@ -939,6 +956,24 @@ public class BluetoothMapService extends ProfileService {
		mRemoveTimeoutMsg = false;
		}

		/**
		* Create both MAP SMS/MMS and EMAIL SDP in a handler thread.
		*/
		public void sendCreateMasInstances() {
		if (mSessionStatusHandler != null && !mSessionStatusHandler
		.hasMessages(CREATE_MAS_INSTANCES)) {
		Log.d(TAG, "mSessionStatusHandler CREATE_MAS_INSTANCES ");
		Message msg = mSessionStatusHandler.obtainMessage(CREATE_MAS_INSTANCES);
		/* We add a small delay here to ensure the call returns true before this message is
		* handled. It seems wrong to add a delay, but the alternative is to build a lock
		* system to handle synchronization, which isn't nice either... */
		mSessionStatusHandler.sendMessage(msg);
		} else if(mSessionStatusHandler != null ) {
		if(DEBUG)
		Log.w(TAG, "mSessionStatusHandler START_MAPEMAIL message already in Queue");
		}
		}

		/**
		* Start the incoming connection listeners for a MAS ID
		* @param masId the MasID to start. Use -1 to start all listeners.
		@@ -1282,7 +1317,9 @@ public class BluetoothMapService extends ProfileService {
		println(sb, "mRemoteDevice: " + mRemoteDevice);
		println(sb, "sRemoteDeviceName: " + sRemoteDeviceName);
		println(sb, "mState: " + mState);
		if (mAppObserver != null) {
		println(sb, "mAppObserver: " + mAppObserver);
		}
		println(sb, "mIsWaitingAuthorization: " + mIsWaitingAuthorization);
		println(sb, "mRemoveTimeoutMsg: " + mRemoveTimeoutMsg);
		println(sb, "mPermission: " + mPermission);
		@@ -1293,8 +1330,10 @@ public class BluetoothMapService extends ProfileService {
		println(sb, " " + key + " : " + mMasInstanceMap.get(key));
		}
		println(sb, "mEnabledAccounts:");
		if (mEnabledAccounts != null) {
		for (BluetoothMapAccountItem account : mEnabledAccounts) {
		println(sb, " " + account);
		}
		}
		}
		}