Merge changes I43a21e8c,Iee37d609 into main (cd8e9af1) · Commits · e / os / android_packages_modules_Bluetooth

android/app/Android.bp

+4 −0

Original line number	Diff line number	Diff line
		@@ -331,6 +331,7 @@ android_app {
		"-Xep:ClassCanBeStatic:ERROR",
		"-Xep:DateFormatConstant:ERROR",
		"-Xep:EmptyBlockTag:ERROR",
		"-Xep:EmptyCatch:ERROR",
		"-Xep:EqualsGetClass:ERROR",
		"-Xep:FallThrough:ERROR",
		"-Xep:HidingField:ERROR",
		@@ -366,6 +367,9 @@ android_app {
		// See https://r.android.com/3200511
		"-Xep:AndroidFrameworkEfficientCollections:OFF",

		// Does not look pertinent in our situation
		"-Xep:AndroidFrameworkEfficientXml:OFF",

		// Exclude generated files
		"-XepExcludedPaths:./srcjars/.",
		],

+1 −0

Original line number	Diff line number	Diff line
		@@ -328,6 +328,7 @@ public class AvrcpBipObexServer extends ServerRequestHandler {
		try {
		outStream.close();
		} catch (IOException e) {
		warn("An exception occurred while closing e=" + e);
		}
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -736,6 +736,7 @@ public class TransitionalScanHelper {
		sendResultsByPendingIntent(
		app.mInfo, permittedResults, ScanSettings.CALLBACK_TYPE_ALL_MATCHES);
		} catch (PendingIntent.CanceledException e) {
		Log.d(TAG, "Exception while sending result", e);
		}
		}
		} else {

+5 −0

Original line number	Diff line number	Diff line
		@@ -520,6 +520,7 @@ public class SapServer extends Thread implements Handler.Callback {
		mHandlerThread.join(HANDLER_THREAD_JOIN_TIMEOUT_MS);
		mHandlerThread = null;
		} catch (InterruptedException e) {
		Log.d(TAG, "Interrupted while joining", e);
		}
		}
		if (mRilBtReceiver != null) {
		@@ -533,6 +534,7 @@ public class SapServer extends Thread implements Handler.Callback {
		mRfcommIn.close();
		mRfcommIn = null;
		} catch (IOException e) {
		Log.d(TAG, "Exception while closing rfcommIn", e);
		}
		}

		@@ -542,6 +544,7 @@ public class SapServer extends Thread implements Handler.Callback {
		mRfcommOut.close();
		mRfcommOut = null;
		} catch (IOException e) {
		Log.d(TAG, "Exception while closing rfcommOut", e);
		}
		}

		@@ -733,12 +736,14 @@ public class SapServer extends Thread implements Handler.Callback {
		mRfcommOut.close();
		}
		} catch (IOException e) {
		Log.d(TAG, "Exception while closing rfcommOut", e);
		}
		try {
		if (mRfcommIn != null) {
		mRfcommIn.close();
		}
		} catch (IOException e) {
		Log.d(TAG, "Exception while closing rfcommIn", e);
		}
		mRfcommIn = null;
		mRfcommOut = null;