Merge "SAP: Initialize mIntentReceiver to null" into oc-mr1-dev (e9ab672a) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/sap/SapServer.java

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -115,13 +115,15 @@ public class SapServer extends Thread implements Callback {
	IntentFilter filter = new IntentFilter();		IntentFilter filter = new IntentFilter();
	filter.addAction(TelephonyManager.ACTION_PHONE_STATE_CHANGED);		filter.addAction(TelephonyManager.ACTION_PHONE_STATE_CHANGED);
	filter.addAction(SAP_DISCONNECT_ACTION);		filter.addAction(SAP_DISCONNECT_ACTION);
			mIntentReceiver = new SapServerBroadcastReceiver();
	mContext.registerReceiver(mIntentReceiver, filter);		mContext.registerReceiver(mIntentReceiver, filter);
	}		}

	/**		/**
	* This handles the response from RIL.		* This handles the response from RIL.
	*/		*/
	BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {		private BroadcastReceiver mIntentReceiver;
			private class SapServerBroadcastReceiver extends BroadcastReceiver {
	@Override		@Override
	public void onReceive(Context context, Intent intent) {		public void onReceive(Context context, Intent intent) {
	if(intent.getAction().equals(TelephonyManager.ACTION_PHONE_STATE_CHANGED)) {		if(intent.getAction().equals(TelephonyManager.ACTION_PHONE_STATE_CHANGED)) {
	@@ -148,8 +150,7 @@ public class SapServer extends Thread implements Callback {
	if(disconnectType == SapMessage.DISC_RFCOMM) {		if(disconnectType == SapMessage.DISC_RFCOMM) {
	// At timeout we need to close the RFCOMM socket to complete shutdown		// At timeout we need to close the RFCOMM socket to complete shutdown
	shutdown();		shutdown();
	} else if( mState != SAP_STATE.DISCONNECTED		} else if (mState != SAP_STATE.DISCONNECTED && mState != SAP_STATE.DISCONNECTING) {
	&& mState != SAP_STATE.DISCONNECTING ) {
	// The user pressed disconnect - initiate disconnect sequence.		// The user pressed disconnect - initiate disconnect sequence.
	sendDisconnectInd(disconnectType);		sendDisconnectInd(disconnectType);
	}		}
	@@ -157,7 +158,7 @@ public class SapServer extends Thread implements Callback {
	Log.w(TAG, "RIL-BT received unexpected Intent: " + intent.getAction());		Log.w(TAG, "RIL-BT received unexpected Intent: " + intent.getAction());
	}		}
	}		}
	};		}

	/**		/**
	* Set RIL driver in test mode - only possible if SapMessage is build with TEST == true		* Set RIL driver in test mode - only possible if SapMessage is build with TEST == true