Merge "Don't reuse NetworkFactory objects." into rvc-dev am: a3d3fbad73 am: 12c87f7388 (501ab9a1) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/pan/BluetoothTetheringNetworkFactory.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -236,7 +236,7 @@ public class BluetoothTetheringNetworkFactory extends NetworkFactory {
		}
		onCancelRequest();
		setScoreFilter(-1);
		unregister();
		terminate();
		}

		private void initNetworkCapabilities() {

+7 −3

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ public class PanService extends ProfileService {
		private boolean mTetherOn = false;

		private BluetoothTetheringNetworkFactory mNetworkFactory;
		private boolean mStarted = false;


		static {
		@@ -124,9 +125,8 @@ public class PanService extends ProfileService {

		mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);

		mNetworkFactory =
		new BluetoothTetheringNetworkFactory(getBaseContext(), getMainLooper(), this);
		setPanService(this);
		mStarted = true;

		return true;
		}
		@@ -605,14 +605,18 @@ public class PanService extends ProfileService {
		mNapIfaceAddr = null;
		}
		}
		} else if (mNetworkFactory != null) {
		} else if (mStarted) {
		// PANU Role = reverse Tether

		Log.d(TAG, "handlePanDeviceStateChange LOCAL_PANU_ROLE:REMOTE_NAP_ROLE state = " + state
		+ ", prevState = " + prevState);
		if (state == BluetoothProfile.STATE_CONNECTED) {
		mNetworkFactory = new BluetoothTetheringNetworkFactory(
		getBaseContext(), getMainLooper(), this);
		mNetworkFactory.startReverseTether(iface);
		} else if (state == BluetoothProfile.STATE_DISCONNECTED) {
		mNetworkFactory.stopReverseTether();
		mNetworkFactory = null;
		mPanDevices.remove(device);
		}
		}