Unverified Commit 5f33999d authored Dec 20, 2025 by Michael Bestas

Merge tag 'android-security-16.0.0_r3' into staging/lineage-23.1_merge-android-security-16.0.0_r3

Android security 16.0.0 release 3

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaS3ZPwAKCRDorT+BmrEO
# eE/DAJ4kTtFeIn4hcUsKUL+ON2IUR3ZssQCfVXNtQ6nFgZvMOT9i1wSYl7Gne4Q=
# =4u6g
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Dec  1 20:06:55 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

* tag 'android-security-16.0.0_r3':
  Catch IllegalArgumentException when unbinding CallRedirectionServiceConnection
  Prevent infinite SPEAKER_OFF looping

Change-Id: Idd4b88c005d81b55500276b94d4e51c85f5f3230

parents 5286249c 014da3f4

src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -137,8 +137,12 @@ public class CallRedirectionProcessor implements CallRedirectionCallback {
		Log.i(this, "notifyTimeout: call redirection has timed out so "
		+ "unbinding the connection");
		if (mConnection != null) {
		try {
		// We still need to call unbind even if the service disconnected.
		mContext.unbindService(mConnection);
		} catch (IllegalArgumentException e) {
		Log.e(this, e, "Error unbinding the connection");
		}
		mConnection = null;
		}
		mService = null;