joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Get rid of volatile mIsRunning

Browse source 
The check for mIsRunning inside catch(IOException) was always race-y as
BluetoothServerSocket could have thrown an unrelated exception at the
same time tearDown() is called -- the only side effect being
inconsistent logging. However, it is safe to call
postDestroyAndUnregisterReservedOffer() as that function first checks
whether the offer still exists.

Therefore, this CL just gets rid of mIsRunning in favor of always
calling postDestroyAndUnregisterReservedOffer().

Test: TH
Change-Id: I6a2b48aa54dfa1ad55030bdcef847a1a9efa0787
This commit is contained in:
Patrick Rohr 2025-02-25 08:47:53 -08:00
commit adfe68f282
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
service/src/com/android/server/L2capNetworkProvider.java
View file

@ -271,7 +271,6 @@ public class L2capNetworkProvider {
private class AcceptThread extends Thread {
private static final int TIMEOUT_MS = 500;
private final BluetoothServerSocket mServerSocket;
private volatile boolean mIsRunning = true;
public AcceptThread(BluetoothServerSocket serverSocket) {
super("L2capNetworkProvider-AcceptThread");
@ -295,16 +294,17 @@ public class L2capNetworkProvider {
@Override
public void run() {
while (mIsRunning) {
while (true) {
final BluetoothSocket connectedSocket;
try {
connectedSocket = mServerSocket.accept();
} catch (IOException e) {
// BluetoothServerSocket was closed().
if (!mIsRunning) return;
// Else, BluetoothServerSocket encountered exception.
Log.e(TAG, "BluetoothServerSocket#accept failed", e);
// Note calling BluetoothServerSocket#close() also triggers an IOException
// which is indistinguishable from any other exceptional behavior.
// postDestroyAndUnregisterReservedOffer() is always safe to call as it
// first checks whether the offer still exists; so if the
// BluetoothServerSocket was closed (i.e. on tearDown()) this is a noop.
Log.w(TAG, "BluetoothServerSocket closed or #accept failed", e);
postDestroyAndUnregisterReservedOffer();
return; // stop running immediately on error
}
@ -314,7 +314,6 @@ public class L2capNetworkProvider {
public void tearDown() {
HandlerUtils.ensureRunningOnHandlerThread(mHandler);
mIsRunning = false;
try {
// BluetoothServerSocket.close() is thread-safe.
mServerSocket.close();