Fixups + Churn

Signed-off-by: Tavi <tavi@divested.dev>

Logs/resetWorkspace-LineageOS-15.1.txt

@@ -68,7 +68,7 @@ external/caliper 4a0d9aba0856d0aa965d5653bfa4c138f0e8a8ba
 external/cblas d063db8bdddfcde61e4bad3bfe65941fd73e8094
 external/chromium-libpac 0ac78251d11006d764ba1aad8cc0867827fafe5c
 external/chromium-trace 8b2c0074e71a8086dee98ca8730acfdc5eddf7a1
-external/chromium-webview ecd8b05d520fcdbc23530879bcda9ca8af7bf150
+external/chromium-webview 78ac5933cd068e59e1758c70e705ce83a326d983
 external/clang 751a76679b0fb5798ea6cab75906df07edcab315
 external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4
 external/compiler-rt 0c46c9e892a3f68420635032ef2f6152dabd197c

Logs/resetWorkspace-LineageOS-16.0.txt

@@ -67,7 +67,7 @@ external/capstone 6788a4139092f179005f7cdbf181ba24b60b6113
 external/cblas ddf5f49cb53866fbc503a6349bf44bac24a6963d
 external/chromium-libpac dff5ddb8d28f6ac9a86eb28763b4313f6f72eec5
 external/chromium-trace b2cf025c7d5cebd43084f38c6c7ff9cc17da428a
-external/chromium-webview ecd8b05d520fcdbc23530879bcda9ca8af7bf150
+external/chromium-webview 78ac5933cd068e59e1758c70e705ce83a326d983
 external/clang f9d2af42fc6d74c28893af371e4647158eaba66c
 external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4
 external/cn-cbor 7fe9f01990a97be4df5e46d2decd894c06678072

Logs/resetWorkspace-LineageOS-17.1.txt

@@ -78,7 +78,7 @@ external/catch2 bcfbb791d09e390fb545c03ca002e570f764d960
 external/cblas 61ee00692011385347a5dd1ad872556899a5cf7a
 external/chromium-libpac c98fc96035e6fdc5b84d953d2bd38d2dcd175467
 external/chromium-trace f4e722b911fcc6f7164026432de62a02ea3460fb
-external/chromium-webview ecd8b05d520fcdbc23530879bcda9ca8af7bf150
+external/chromium-webview 78ac5933cd068e59e1758c70e705ce83a326d983
 external/clang 8343f599c9e1dda8e6c1bb779af323a673a052f9
 external/cldr 4e0bdd442c1e01f5c6147cf6032ce4f8587f4ede
 external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4

Patches/LineageOS-15.1/android_frameworks_base/405830.patch

@@ -1,4 +1,4 @@
-From 036b28bd48fae9e16d8b1b2a8bb629f4221e41c2 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: William Loh <wloh@google.com>
 Date: Mon, 3 Jun 2024 12:56:47 -0700
 Subject: [PATCH] Fail parseUri if end is missing
@@ -15,10 +15,10 @@ Change-Id: I5f619ced684ff505ce2b7408cd35dd3e9be89dea
  1 file changed, 3 insertions(+)
 
 diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
-index 66c2658f9f132..dbed1b1a8fd31 100644
+index c0ccd33273e9..3367b56bc77b 100644
 --- a/core/java/android/content/Intent.java
 +++ b/core/java/android/content/Intent.java
-@@ -6277,6 +6277,9 @@ public static Intent parseUri(String uri, @UriFlags int flags) throws URISyntaxE
+@@ -5975,6 +5975,9 @@ public class Intent implements Parcelable, Cloneable {
                  int eq = uri.indexOf('=', i);
                  if (eq < 0) eq = i-1;
                  int semi = uri.indexOf(';', i);

Patches/LineageOS-15.1/android_libcore/405831.patch

@@ -1,4 +1,4 @@
-From b7877b7a39d68acb35c40d1df1b588f067cca800 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Almaz Mingaleev <mingaleev@google.com>
 Date: Wed, 10 Jul 2024 13:38:35 +0100
 Subject: [PATCH] Do not accept zip files with invalid headers.
@@ -30,10 +30,10 @@ Change-Id: I545cdd49ec3cc138331145f4716c8148662a478b
  1 file changed, 11 insertions(+)
 
 diff --git a/ojluni/src/main/native/zip_util.c b/ojluni/src/main/native/zip_util.c
-index e2503e84c2e..1f38b1783f1 100644
+index 79245807df9..e70dfb99f8b 100644
 --- a/ojluni/src/main/native/zip_util.c
 +++ b/ojluni/src/main/native/zip_util.c
-@@ -876,6 +876,17 @@ ZIP_Put_In_Cache0(const char *name, ZFILE zfd, char **pmsg, jlong lastModified,
+@@ -875,6 +875,17 @@ ZIP_Put_In_Cache0(const char *name, ZFILE zfd, char **pmsg, jlong lastModified,
              zip->locsig = JNI_TRUE;
          else
              zip->locsig = JNI_FALSE;

Patches/LineageOS-16.0/android_frameworks_av/403537.patch

@@ -1,4 +1,4 @@
-From c47fb676909e2e0896f08880dd542ea89040f791 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Alexander Grund <flamefire89@gmail.com>
 Date: Tue, 27 Aug 2024 16:53:27 +0200
 Subject: [PATCH] Fix flag check in JAudioTrack.cpp
@@ -12,7 +12,7 @@ Change-Id: Ifd2e98e7bb394c35a8a2f4ebde512046823da043
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/media/libmediaplayer2/JAudioTrack.cpp b/media/libmediaplayer2/JAudioTrack.cpp
-index ac0cc5775ec..961d7e526e4 100644
+index ac0cc5775e..961d7e526e 100644
 --- a/media/libmediaplayer2/JAudioTrack.cpp
 +++ b/media/libmediaplayer2/JAudioTrack.cpp
 @@ -615,26 +615,26 @@ jobject JAudioTrack::createVolumeShaperOperationObj(

Patches/LineageOS-16.0/android_frameworks_base/403538.patch

@@ -1,4 +1,4 @@
-From f92b87e0fa6d86e076aa7138f6c0c0be16e5b901 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kiran Ramachandra <kiranmr@google.com>
 Date: Wed, 5 Jun 2024 21:03:33 +0000
 Subject: [PATCH] DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme
@@ -19,10 +19,10 @@ Change-Id: I88b1550a5d8b3dc0f6286e28899884025d059645
  2 files changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java
-index af1c0e8e91788..d0fcc4240fd98 100644
+index af1c0e8e9178..d0fcc4240fd9 100644
 --- a/core/java/android/net/Uri.java
 +++ b/core/java/android/net/Uri.java
-@@ -1365,7 +1365,11 @@ public Builder() {}
+@@ -1365,7 +1365,11 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
           * @param scheme name or {@code null} if this is a relative Uri
           */
          public Builder scheme(String scheme) {
@@ -36,10 +36,10 @@ index af1c0e8e91788..d0fcc4240fd98 100644
          }
  
 diff --git a/core/tests/coretests/src/android/net/UriTest.java b/core/tests/coretests/src/android/net/UriTest.java
-index ea0347d67ad74..6c9fdd5a83a78 100644
+index ea0347d67ad7..6c9fdd5a83a7 100644
 --- a/core/tests/coretests/src/android/net/UriTest.java
 +++ b/core/tests/coretests/src/android/net/UriTest.java
-@@ -18,6 +18,7 @@
+@@ -18,6 +18,7 @@ package android.net;
  
  import android.content.ContentUris;
  import android.os.Parcel;
@@ -47,7 +47,7 @@ index ea0347d67ad74..6c9fdd5a83a78 100644
  import android.test.suitebuilder.annotation.SmallTest;
  
  import junit.framework.TestCase;
-@@ -83,6 +84,16 @@ public void testBuildUponOpaqueStringUri() {
+@@ -83,6 +84,16 @@ public class UriTest extends TestCase {
          assertNull(u.getHost());
      }
  

Patches/LineageOS-16.0/android_frameworks_base/405829.patch

@@ -1,4 +1,4 @@
-From a2fea355e79d8057e5910f52ef067642b1d46189 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Dmitry Dementyev <dementyev@google.com>
 Date: Thu, 11 Jul 2024 12:39:22 -0700
 Subject: [PATCH] Update AccountManagerService checkKeyIntent.
@@ -17,10 +17,10 @@ Change-Id: I8b23191d3d60036ca7ddf0ef7dcba6b38fb27b3c
  1 file changed, 3 insertions(+)
 
 diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
-index 19e1a4c55120a..c5fff3652c283 100644
+index 19e1a4c55120..c5fff3652c28 100644
 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java
 +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
-@@ -4799,6 +4799,9 @@ protected boolean checkKeyIntent(int authUid, Bundle bundle) {
+@@ -4799,6 +4799,9 @@ public class AccountManagerService
                  if (resolveInfo == null) {
                      return false;
                  }

Patches/LineageOS-16.0/android_frameworks_base/405830.patch

@@ -1,4 +1,4 @@
-From 036b28bd48fae9e16d8b1b2a8bb629f4221e41c2 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: William Loh <wloh@google.com>
 Date: Mon, 3 Jun 2024 12:56:47 -0700
 Subject: [PATCH] Fail parseUri if end is missing
@@ -15,10 +15,10 @@ Change-Id: I5f619ced684ff505ce2b7408cd35dd3e9be89dea
  1 file changed, 3 insertions(+)
 
 diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
-index 66c2658f9f132..dbed1b1a8fd31 100644
+index 66c2658f9f13..dbed1b1a8fd3 100644
 --- a/core/java/android/content/Intent.java
 +++ b/core/java/android/content/Intent.java
-@@ -6277,6 +6277,9 @@ public static Intent parseUri(String uri, @UriFlags int flags) throws URISyntaxE
+@@ -6277,6 +6277,9 @@ public class Intent implements Parcelable, Cloneable {
                  int eq = uri.indexOf('=', i);
                  if (eq < 0) eq = i-1;
                  int semi = uri.indexOf(';', i);

Patches/LineageOS-16.0/android_libcore/405831.patch

@@ -1,4 +1,4 @@
-From b7877b7a39d68acb35c40d1df1b588f067cca800 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Almaz Mingaleev <mingaleev@google.com>
 Date: Wed, 10 Jul 2024 13:38:35 +0100
 Subject: [PATCH] Do not accept zip files with invalid headers.

Patches/LineageOS-16.0/android_packages_apps_Bluetooth/0001-constify_JNINativeMethod.patch

@@ -205,10 +205,10 @@ index 403e90403..0b792c974 100644
      {"initNative", "()V", (void*)initNative},
      {"cleanupNative", "()V", (void*)cleanupNative},
 diff --git a/jni/com_android_bluetooth_hid_host.cpp b/jni/com_android_bluetooth_hid_host.cpp
-index 7838ff6ce..9b233c654 100644
+index 60fffc2f3..a709c8479 100644
 --- a/jni/com_android_bluetooth_hid_host.cpp
 +++ b/jni/com_android_bluetooth_hid_host.cpp
-@@ -498,7 +498,7 @@ static jboolean setIdleTimeNative(JNIEnv* env, jobject object,
+@@ -500,7 +500,7 @@ static jboolean setIdleTimeNative(JNIEnv* env, jobject object,
    return status == BT_STATUS_SUCCESS ? JNI_TRUE : JNI_FALSE;
  }
  

Patches/LineageOS-16.0/android_packages_apps_Bluetooth/405835.patch

@@ -1,7 +1,7 @@
-From 6d050ad48cfcf668435f391733d28752061e62db Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Himanshu Rawat <rwt@google.com>
 Date: Mon, 8 Apr 2024 19:44:45 +0000
-Subject: [PATCH] [BACKPORT] Disallow unexpected incoming HID connections 2/2
+Subject: [PATCH] Disallow unexpected incoming HID connections 2/2
 
 HID profile accepted any new incoming HID connection. Even when the
 connection policy disabled HID connection, remote devices could initiate
@@ -60,7 +60,7 @@ diff --git a/src/com/android/bluetooth/hid/HidHostService.java b/src/com/android
 index 63f52060b..1113760f2 100644
 --- a/src/com/android/bluetooth/hid/HidHostService.java
 +++ b/src/com/android/bluetooth/hid/HidHostService.java
-@@ -157,7 +157,10 @@ public void handleMessage(Message msg) {
+@@ -157,7 +157,10 @@ public class HidHostService extends ProfileService {
                  break;
                  case MESSAGE_DISCONNECT: {
                      BluetoothDevice device = (BluetoothDevice) msg.obj;
@@ -72,7 +72,7 @@ index 63f52060b..1113760f2 100644
                          broadcastConnectionState(device, BluetoothProfile.STATE_DISCONNECTING);
                          broadcastConnectionState(device, BluetoothProfile.STATE_DISCONNECTED);
                          break;
-@@ -181,7 +184,10 @@ public void handleMessage(Message msg) {
+@@ -181,7 +184,10 @@ public class HidHostService extends ProfileService {
                          if (DBG) {
                              Log.d(TAG, "Incoming HID connection rejected");
                          }
@@ -84,7 +84,7 @@ index 63f52060b..1113760f2 100644
                      } else {
                          broadcastConnectionState(device, convertHalState(halState));
                      }
-@@ -873,7 +879,7 @@ public void dump(StringBuilder sb) {
+@@ -873,7 +879,7 @@ public class HidHostService extends ProfileService {
  
      private native boolean connectHidNative(byte[] btAddress);
  

Patches/LineageOS-16.0/android_packages_apps_Settings/403539.patch

@@ -1,4 +1,4 @@
-From 6fcac8928498d5184ba7e4bdc56315025a085510 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chaohui Wang <chaohuiw@google.com>
 Date: Thu, 2 Nov 2023 11:43:00 +0800
 Subject: [PATCH] Limit wifi item edit content's max length to 500

Patches/LineageOS-16.0/android_packages_apps_Settings/403540.patch

@@ -1,4 +1,4 @@
-From 814483f2eee226ee461cea6685325b6f0b04748f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jason Chiu <chiujason@google.com>
 Date: Wed, 31 Jan 2024 16:29:01 +0800
 Subject: [PATCH] Replace getCallingActivity() with getLaunchedFromPackage()
@@ -51,7 +51,7 @@ index 78c47edf046..7c88785b337 100644
  import com.android.internal.annotations.VisibleForTesting;
  import com.android.settings.overlay.FeatureFactory;
  import com.android.settings.search.indexing.IndexData;
-@@ -32,24 +33,21 @@
+@@ -32,24 +33,21 @@ import java.util.Locale;
   */
  public class SearchFeatureProviderImpl implements SearchFeatureProvider {
  
@@ -87,7 +87,7 @@ diff --git a/src/com/android/settings/search/SearchResultTrampoline.java b/src/c
 index 3bbe6bd58a7..70387b021d4 100644
 --- a/src/com/android/settings/search/SearchResultTrampoline.java
 +++ b/src/com/android/settings/search/SearchResultTrampoline.java
-@@ -38,7 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
+@@ -38,7 +38,7 @@ public class SearchResultTrampoline extends Activity {
          // First make sure caller has privilege to launch a search result page.
          FeatureFactory.getFactory(this)
                  .getSearchFeatureProvider()
@@ -100,7 +100,7 @@ diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProvid
 index eeebdee96e3..7945c05a293 100644
 --- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
 +++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
-@@ -21,7 +21,6 @@
+@@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat;
  import static org.mockito.Mockito.spy;
  
  import android.app.Activity;
@@ -108,7 +108,7 @@ index eeebdee96e3..7945c05a293 100644
  import android.content.Intent;
  import android.widget.Toolbar;
  
-@@ -70,21 +69,23 @@ public void verifyLaunchSearchResultPageCaller_nullCaller_shouldCrash() {
+@@ -70,21 +69,23 @@ public class SearchFeatureProviderImplTest {
  
      @Test(expected = SecurityException.class)
      public void verifyLaunchSearchResultPageCaller_badCaller_shouldCrash() {

Patches/LineageOS-16.0/android_packages_apps_Settings/403541.patch

@@ -1,4 +1,4 @@
-From e689177d16d953c283522c777e470da1e873d15d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chris Antol <cantol@google.com>
 Date: Tue, 4 Jun 2024 17:00:46 +0000
 Subject: [PATCH] Ignore fragment attr from ext authenticator resource
@@ -19,7 +19,7 @@ diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
 index 3914fac39b4..ce3d61d4dfa 100644
 --- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
 +++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
-@@ -37,6 +37,11 @@
+@@ -37,6 +37,11 @@ import android.support.v7.preference.PreferenceScreen;
  import android.text.TextUtils;
  import android.util.Log;
  
@@ -31,7 +31,7 @@ index 3914fac39b4..ce3d61d4dfa 100644
  import com.android.settings.R;
  import com.android.settings.core.SubSettingLauncher;
  import com.android.settings.location.LocationSettings;
-@@ -44,6 +49,8 @@
+@@ -44,6 +49,8 @@ import com.android.settings.utils.LocalClassLoaderContextThemeWrapper;
  import com.android.settingslib.accounts.AuthenticatorHelper;
  import com.android.settingslib.core.instrumentation.Instrumentable;
  
@@ -40,7 +40,7 @@ index 3914fac39b4..ce3d61d4dfa 100644
  /**
   * Class to load the preference screen to be added to the settings page for the specific account
   * type as specified in the account-authenticator.
-@@ -82,6 +89,7 @@ public PreferenceScreen addPreferencesForType(final String accountType,
+@@ -82,6 +89,7 @@ public class AccountTypePreferenceLoader {
              try {
                  desc = mAuthenticatorHelper.getAccountTypeDescription(accountType);
                  if (desc != null && desc.accountPreferencesId != 0) {
@@ -48,7 +48,7 @@ index 3914fac39b4..ce3d61d4dfa 100644
                      // Load the context of the target package, then apply the
                      // base Settings theme (no references to local resources)
                      // and create a context theme wrapper so that we get the
-@@ -97,6 +105,12 @@ public PreferenceScreen addPreferencesForType(final String accountType,
+@@ -97,6 +105,12 @@ public class AccountTypePreferenceLoader {
                      themedCtx.getTheme().setTo(baseTheme);
                      prefs = mFragment.getPreferenceManager().inflateFromResource(themedCtx,
                              desc.accountPreferencesId, parent);
@@ -61,7 +61,7 @@ index 3914fac39b4..ce3d61d4dfa 100644
                  }
              } catch (PackageManager.NameNotFoundException e) {
                  Log.w(TAG, "Couldn't load preferences.xml file from " + desc.packageName);
-@@ -181,6 +195,48 @@ public boolean onPreferenceClick(Preference preference) {
+@@ -181,6 +195,48 @@ public class AccountTypePreferenceLoader {
          }
      }
  

Patches/LineageOS-16.0/android_packages_services_Telecomm/403542.patch

@@ -1,4 +1,4 @@
-From 4923eb8efebb69b7870a032bbea8b4b0c36382ad Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Grant Menke <grantmenke@google.com>
 Date: Thu, 25 Apr 2024 10:43:43 -0700
 Subject: [PATCH] DO NOT MERGE Unbind CS if connection is not created within 15
@@ -28,7 +28,7 @@ diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/t
 index bc20d1caf..f4ec11187 100644
 --- a/src/com/android/server/telecom/Call.java
 +++ b/src/com/android/server/telecom/Call.java
-@@ -306,6 +306,17 @@ public void onContactPhotoQueryComplete(Uri handle, CallerInfo callerInfo) {
+@@ -306,6 +306,17 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
      /** The state of the call. */
      private int mState;
  
@@ -46,7 +46,7 @@ index bc20d1caf..f4ec11187 100644
      /** The handle with which to establish this call. */
      private Uri mHandle;
  
-@@ -797,6 +808,19 @@ public ConnectionServiceFocusManager.ConnectionServiceFocus getConnectionService
+@@ -797,6 +808,19 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
          return mConnectionService;
      }
  
@@ -66,7 +66,7 @@ index bc20d1caf..f4ec11187 100644
      @VisibleForTesting
      public int getState() {
          return mState;
-@@ -1638,6 +1662,7 @@ public void handleCreateConnectionSuccess(
+@@ -1638,6 +1662,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
              CallIdMapper idMapper,
              ParcelableConnection connection) {
          Log.v(this, "handleCreateConnectionSuccessful %s", connection);
@@ -78,7 +78,7 @@ diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/
 index 1b86842af..55ae0b6c8 100644
 --- a/src/com/android/server/telecom/ConnectionServiceWrapper.java
 +++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java
-@@ -34,6 +34,7 @@
+@@ -34,6 +34,7 @@ import android.telecom.ConnectionService;
  import android.telecom.DisconnectCause;
  import android.telecom.GatewayInfo;
  import android.telecom.Log;
@@ -86,7 +86,7 @@ index 1b86842af..55ae0b6c8 100644
  import android.telecom.Logging.Session;
  import android.telecom.ParcelableConference;
  import android.telecom.ParcelableConnection;
-@@ -57,6 +58,11 @@
+@@ -57,6 +58,11 @@ import java.util.List;
  import java.util.Map;
  import java.util.Set;
  import java.util.concurrent.ConcurrentHashMap;
@@ -98,7 +98,7 @@ index 1b86842af..55ae0b6c8 100644
  
  /**
   * Wrapper for {@link IConnectionService}s, handles binding to {@link IConnectionService} and keeps
-@@ -68,6 +74,12 @@
+@@ -68,6 +74,12 @@ import java.util.concurrent.ConcurrentHashMap;
  public class ConnectionServiceWrapper extends ServiceBinder implements
          ConnectionServiceFocusManager.ConnectionServiceFocus {
  
@@ -111,7 +111,7 @@ index 1b86842af..55ae0b6c8 100644
      private final class Adapter extends IConnectionServiceAdapter.Stub {
  
          @Override
-@@ -79,6 +91,12 @@ public void handleCreateConnectionComplete(String callId, ConnectionRequest requ
+@@ -79,6 +91,12 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
              try {
                  synchronized (mLock) {
                      logIncoming("handleCreateConnectionComplete %s", callId);
@@ -124,7 +124,7 @@ index 1b86842af..55ae0b6c8 100644
                      // Check status hints image for cross user access
                      if (connection.getStatusHints() != null) {
                          Icon icon = connection.getStatusHints().getIcon();
-@@ -1027,7 +1045,8 @@ public void onConnectionServiceFocusReleased(Session.Info sessionInfo)
+@@ -1027,7 +1045,8 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
       * @param context The context.
       * @param userHandle The {@link UserHandle} to use when binding.
       */
@@ -134,7 +134,7 @@ index 1b86842af..55ae0b6c8 100644
              ComponentName componentName,
              ConnectionServiceRepository connectionServiceRepository,
              PhoneAccountRegistrar phoneAccountRegistrar,
-@@ -1129,6 +1148,26 @@ public void onSuccess() {
+@@ -1129,6 +1148,26 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
                          .setRttPipeToInCall(call.getCsToInCallRttPipeForCs())
                          .build();
  
@@ -161,7 +161,7 @@ index 1b86842af..55ae0b6c8 100644
                  try {
                      mServiceInterface.createConnection(
                              call.getConnectionManagerPhoneAccount(),
-@@ -1414,7 +1453,8 @@ void stopDtmfTone(Call call) {
+@@ -1414,7 +1453,8 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
          }
      }
  
@@ -171,7 +171,7 @@ index 1b86842af..55ae0b6c8 100644
          if (mCallIdMapper.getCallId(call) == null) {
              mCallIdMapper.addCall(call);
          }
-@@ -1778,4 +1818,9 @@ private void setRemoteServices(
+@@ -1778,4 +1818,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
      private void noRemoteServices(RemoteServiceCallback callback) {
          setRemoteServices(callback, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
      }
@@ -185,7 +185,7 @@ diff --git a/src/com/android/server/telecom/LogUtils.java b/src/com/android/serv
 index 02a3b7785..66efb5c92 100644
 --- a/src/com/android/server/telecom/LogUtils.java
 +++ b/src/com/android/server/telecom/LogUtils.java
-@@ -86,6 +86,7 @@ public final static class Events {
+@@ -86,6 +86,7 @@ public class LogUtils {
          public static final String STOP_CALL_WAITING_TONE = "STOP_CALL_WAITING_TONE";
          public static final String START_CONNECTION = "START_CONNECTION";
          public static final String CREATE_CONNECTION_FAILED = "CREATE_CONNECTION_FAILED";
@@ -197,7 +197,7 @@ diff --git a/tests/src/com/android/server/telecom/tests/BasicCallTests.java b/te
 index 190604a75..810c01aa3 100644
 --- a/tests/src/com/android/server/telecom/tests/BasicCallTests.java
 +++ b/tests/src/com/android/server/telecom/tests/BasicCallTests.java
-@@ -927,6 +927,7 @@ public void testOutgoingCallSelectPhoneAccountVideo() throws Exception {
+@@ -927,6 +927,7 @@ public class BasicCallTests extends TelecomSystemTest {
          call.setTargetPhoneAccount(mPhoneAccountA1.getAccountHandle());
          assert(call.isVideoCallingSupported());
          assertEquals(VideoProfile.STATE_BIDIRECTIONAL, call.getVideoState());
@@ -205,7 +205,7 @@ index 190604a75..810c01aa3 100644
      }
  
      /**
-@@ -950,6 +951,7 @@ public void testOutgoingCallSelectPhoneAccountNoVideo() throws Exception {
+@@ -950,6 +951,7 @@ public class BasicCallTests extends TelecomSystemTest {
          call.setTargetPhoneAccount(mPhoneAccountA2.getAccountHandle());
          assert(!call.isVideoCallingSupported());
          assertEquals(VideoProfile.STATE_AUDIO_ONLY, call.getVideoState());
@@ -217,7 +217,7 @@ diff --git a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java b/
 index ed2f6b19b..abc300555 100644
 --- a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java
 +++ b/tests/src/com/android/server/telecom/tests/CallsManagerTest.java
-@@ -31,6 +31,7 @@
+@@ -31,6 +31,7 @@ import static org.mockito.Mockito.when;
  
  import android.content.ComponentName;
  import android.net.Uri;
@@ -225,7 +225,7 @@ index ed2f6b19b..abc300555 100644
  import android.os.SystemClock;
  import android.telecom.Connection;
  import android.telecom.PhoneAccount;
-@@ -44,11 +45,13 @@
+@@ -44,11 +45,13 @@ import com.android.server.telecom.AsyncRingtonePlayer;
  import com.android.server.telecom.Call;
  import com.android.server.telecom.CallAudioManager;
  import com.android.server.telecom.CallState;
@@ -247,7 +247,7 @@ index ed2f6b19b..abc300555 100644
  
      private CallsManager mCallsManager;
  
-@@ -190,8 +194,22 @@ public void setUp() throws Exception {
+@@ -190,8 +194,22 @@ public class CallsManagerTest extends TelecomTestCase {
                  eq(SIM_1_HANDLE), any())).thenReturn(SIM_1_ACCOUNT);
          when(mPhoneAccountRegistrar.getPhoneAccount(
                  eq(SIM_2_HANDLE), any())).thenReturn(SIM_2_ACCOUNT);
@@ -270,7 +270,7 @@ index ed2f6b19b..abc300555 100644
      @MediumTest
      @Test
      public void testConstructPossiblePhoneAccounts() throws Exception {
-@@ -684,6 +702,33 @@ public void testSetActiveCallWhenOngoingCallCanBeHeld() {
+@@ -684,6 +702,33 @@ public class CallsManagerTest extends TelecomTestCase {
          assertEquals(CallState.ACTIVE, newCall.getState());
      }
  
@@ -304,7 +304,7 @@ index ed2f6b19b..abc300555 100644
      private Call addSpyCallWithConnectionService(ConnectionServiceWrapper connSvr) {
          Call call = addSpyCall();
          doReturn(connSvr).when(call).getConnectionService();
-@@ -739,4 +784,19 @@ private void setupMsimAccounts() {
+@@ -739,4 +784,19 @@ public class CallsManagerTest extends TelecomTestCase {
          when(mPhoneAccountRegistrar.getSimPhoneAccountsOfCurrentUser()).thenReturn(
                  new ArrayList<>(Arrays.asList(SIM_1_HANDLE, SIM_2_HANDLE)));
      }
@@ -328,7 +328,7 @@ diff --git a/tests/src/com/android/server/telecom/tests/ComponentContextFixture.
 index 01d312b98..86918a064 100644
 --- a/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java
 +++ b/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java
-@@ -499,6 +499,14 @@ public void addConnectionService(
+@@ -499,6 +499,14 @@ public class ComponentContextFixture implements TestFixture<Context> {
          mServiceInfoByComponentName.put(componentName, serviceInfo);
      }
  
@@ -343,7 +343,7 @@ index 01d312b98..86918a064 100644
      public void addInCallService(
              ComponentName componentName,
              IInCallService service)
-@@ -541,6 +549,12 @@ private void addService(String action, ComponentName name, IInterface service) {
+@@ -541,6 +549,12 @@ public class ComponentContextFixture implements TestFixture<Context> {
          mComponentNameByService.put(service, name);
      }
  

Patches/LineageOS-16.0/android_system_bt/405833.patch

@@ -1,4 +1,4 @@
-From cae2930774ada0de113a04086e2d10009e6774e3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chris Manton <cmanton@google.com>
 Date: Sun, 14 Mar 2021 09:52:19 -0700
 Subject: [PATCH] Add btif/include/btif_hh::btif_hh_status_text
@@ -16,7 +16,7 @@ Change-Id: Iab6a4f33a3e498c33f4870abc5abd59e073d03f2
  1 file changed, 20 insertions(+), 1 deletion(-)
 
 diff --git a/btif/include/btif_hh.h b/btif/include/btif_hh.h
-index 2364544824e..5c1ad45108b 100644
+index 236454482..5c1ad4510 100644
 --- a/btif/include/btif_hh.h
 +++ b/btif/include/btif_hh.h
 @@ -45,7 +45,7 @@

Patches/LineageOS-16.0/android_system_bt/405834.patch

@@ -1,7 +1,7 @@
-From d2c71969119d6c4bee9c9da387af449827448d03 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Himanshu Rawat <rwt@google.com>
 Date: Mon, 8 Apr 2024 19:42:21 +0000
-Subject: [PATCH] [BACKPORT] Disallow unexpected incoming HID connections 1/2
+Subject: [PATCH] Disallow unexpected incoming HID connections 1/2
 
 HID profile accepted any new incoming HID connection. Even when the
 connection policy disabled HID connection, remote devices could initiate
@@ -27,7 +27,7 @@ Change-Id: I6e9db983e752dd498625078c13b736cd4c668806
  5 files changed, 160 insertions(+), 8 deletions(-)
 
 diff --git a/btif/include/btif_hh.h b/btif/include/btif_hh.h
-index 5c1ad45108b..8c9ead46283 100644
+index 5c1ad4510..8c9ead462 100644
 --- a/btif/include/btif_hh.h
 +++ b/btif/include/btif_hh.h
 @@ -94,6 +94,7 @@ typedef struct {
@@ -49,7 +49,7 @@ index 5c1ad45108b..8c9ead46283 100644
  extern void btif_hh_disconnect(RawAddress* bd_addr);
  extern void btif_hh_setreport(btif_hh_device_t* p_dev,
 diff --git a/btif/include/btif_storage.h b/btif/include/btif_storage.h
-index 07d29c81a7e..365f714d2d6 100644
+index 07d29c81a..365f714d2 100644
 --- a/btif/include/btif_storage.h
 +++ b/btif/include/btif_storage.h
 @@ -152,6 +152,29 @@ bt_status_t btif_storage_remove_bonded_device(const RawAddress* remote_bd_addr);
@@ -83,7 +83,7 @@ index 07d29c81a7e..365f714d2d6 100644
   *
   * Function         btif_storage_add_hid_device_info
 diff --git a/btif/src/btif_hh.cc b/btif/src/btif_hh.cc
-index b6441e1cce0..ea6559d34f2 100644
+index b6441e1cc..ea6559d34 100644
 --- a/btif/src/btif_hh.cc
 +++ b/btif/src/btif_hh.cc
 @@ -338,6 +338,24 @@ btif_hh_device_t* btif_hh_find_connected_dev_by_handle(uint8_t handle) {
@@ -261,7 +261,7 @@ index b6441e1cce0..ea6559d34f2 100644
  
    osi_free_and_reset((void**)&dscp_info.descriptor.dsc_list);
 diff --git a/btif/src/btif_storage.cc b/btif/src/btif_storage.cc
-index ef2e191ebce..f768845dddf 100644
+index ef2e191eb..f768845dd 100644
 --- a/btif/src/btif_storage.cc
 +++ b/btif/src/btif_storage.cc
 @@ -85,6 +85,8 @@ using bluetooth::Uuid;
@@ -347,7 +347,7 @@ index ef2e191ebce..f768845dddf 100644
    return BT_STATUS_SUCCESS;
  }
 diff --git a/include/hardware/bt_hh.h b/include/hardware/bt_hh.h
-index b87b129bb12..923c6279216 100644
+index b87b129bb..923c62792 100644
 --- a/include/hardware/bt_hh.h
 +++ b/include/hardware/bt_hh.h
 @@ -154,7 +154,7 @@ typedef struct {

Patches/LineageOS-17.1/android_frameworks_av/403300.patch

@@ -1,4 +1,4 @@
-From a9760e6a3e5a55ed5e67881bca5d3242ee5fe2ad Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Wonsik Kim <wonsik@google.com>
 Date: Fri, 28 Jun 2024 00:33:51 +0000
 Subject: [PATCH] omx: check HDR10+ info param size
@@ -15,7 +15,7 @@ Change-Id: I72523e1de61e5f947174272b732e170e1c2964df
  1 file changed, 7 insertions(+)
 
 diff --git a/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp b/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
-index 418302389d1..4ab5d106096 100644
+index 418302389d..4ab5d10609 100644
 --- a/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
 +++ b/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
 @@ -619,6 +619,13 @@ OMX_ERRORTYPE SoftVideoDecoderOMXComponent::getConfig(

Patches/LineageOS-17.1/android_frameworks_base/403301.patch

@@ -1,4 +1,4 @@
-From 337e31b00dc055d99911ec527f79183c2e881033 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kiran Ramachandra <kiranmr@google.com>
 Date: Wed, 5 Jun 2024 21:03:33 +0000
 Subject: [PATCH] DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme
@@ -19,10 +19,10 @@ Change-Id: I88b1550a5d8b3dc0f6286e28899884025d059645
  2 files changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java
-index 33acef7f95060..3f3501d1dbca5 100644
+index 33acef7f9506..3f3501d1dbca 100644
 --- a/core/java/android/net/Uri.java
 +++ b/core/java/android/net/Uri.java
-@@ -1380,7 +1380,11 @@ public Builder() {}
+@@ -1380,7 +1380,11 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
           * @param scheme name or {@code null} if this is a relative Uri
           */
          public Builder scheme(String scheme) {
@@ -36,10 +36,10 @@ index 33acef7f95060..3f3501d1dbca5 100644
          }
  
 diff --git a/core/tests/coretests/src/android/net/UriTest.java b/core/tests/coretests/src/android/net/UriTest.java
-index 670aefd21d360..17a37831afdb1 100644
+index 670aefd21d36..17a37831afdb 100644
 --- a/core/tests/coretests/src/android/net/UriTest.java
 +++ b/core/tests/coretests/src/android/net/UriTest.java
-@@ -18,6 +18,7 @@
+@@ -18,6 +18,7 @@ package android.net;
  
  import android.content.ContentUris;
  import android.os.Parcel;
@@ -47,7 +47,7 @@ index 670aefd21d360..17a37831afdb1 100644
  
  import androidx.test.filters.SmallTest;
  
-@@ -88,6 +89,16 @@ public void testBuildUponOpaqueStringUri() {
+@@ -88,6 +89,16 @@ public class UriTest extends TestCase {
          assertNull(u.getHost());
      }
  

Patches/LineageOS-17.1/android_frameworks_base/405515.patch

@@ -1,4 +1,4 @@
-From b0aee0b8b81d776e7c3234f7b340a856d138e4c4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Dmitry Dementyev <dementyev@google.com>
 Date: Thu, 11 Jul 2024 12:39:22 -0700
 Subject: [PATCH] Update AccountManagerService checkKeyIntent.
@@ -17,10 +17,10 @@ Change-Id: I8b23191d3d60036ca7ddf0ef7dcba6b38fb27b3c
  1 file changed, 3 insertions(+)
 
 diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
-index 37a68d3eec76c..fb79904a5b3a8 100644
+index bf577735d037..e8c8b32884e9 100644
 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java
 +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
-@@ -4812,6 +4812,9 @@ protected boolean checkKeyIntent(int authUid, Bundle bundle) {
+@@ -4822,6 +4822,9 @@ public class AccountManagerService
                  if (resolveInfo == null) {
                      return false;
                  }

Patches/LineageOS-17.1/android_frameworks_base/405516.patch

@@ -1,4 +1,4 @@
-From f31bdd9c6658dfb932eea857f17cc2d21124031e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: William Loh <wloh@google.com>
 Date: Mon, 3 Jun 2024 12:56:47 -0700
 Subject: [PATCH] Fail parseUri if end is missing
@@ -15,10 +15,10 @@ Change-Id: I5f619ced684ff505ce2b7408cd35dd3e9be89dea
  1 file changed, 3 insertions(+)
 
 diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
-index 24d59a0826c85..4ea29407f352f 100644
+index 72e0fa615b09..0685466bfa74 100644
 --- a/core/java/android/content/Intent.java
 +++ b/core/java/android/content/Intent.java
-@@ -7053,6 +7053,9 @@ public static Intent parseUri(String uri, @UriFlags int flags) throws URISyntaxE
+@@ -6708,6 +6708,9 @@ public class Intent implements Parcelable, Cloneable {
                  int eq = uri.indexOf('=', i);
                  if (eq < 0) eq = i-1;
                  int semi = uri.indexOf(';', i);

Patches/LineageOS-17.1/android_frameworks_base/405517-backport.patch

@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Renouf <mrenouf@google.com>
-Date: Thu, 20 Jun 2024 16:37:42 -0400
-Subject: [PATCH] Prevent Sharing when FRP enforcement is in effect
-
-ADB command to trigger sharing:
-
-```
-adb shell 'am start -a android.intent.action.CHOOSER --eu android.intent.extra.INTENT "intent:#Intent;action=android.intent.action.SEND;type=text/plain;S.android.intent.extra.TEXT=Shared%20text;end"'
-```
-
-Bug: 327645387
-Test: manual; trigger FRP; attempt to open share sheet using adb
-(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5080af26387a18d5638d5a42eadfb8d4d700518c)
-Merged-In: I1db78ab74babe71b516f601be35cf476b5e43271
-Change-Id: I1db78ab74babe71b516f601be35cf476b5e43271
----
- core/java/com/android/internal/app/ChooserActivity.java | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
-index 2e17dce90240..300e1053cc16 100644
---- a/core/java/com/android/internal/app/ChooserActivity.java
-+++ b/core/java/com/android/internal/app/ChooserActivity.java
-@@ -525,6 +525,14 @@ public class ChooserActivity extends ResolverActivity {
- 
-     @Override
-     protected void onCreate(Bundle savedInstanceState) {
-+        if (Settings.Secure.getIntForUser(getContentResolver(),
-+                Settings.Secure.SECURE_FRP_MODE, 0,
-+                getUserId()) == 1) {
-+            Log.e(TAG, "Sharing disabled due to active FRP lock.");
-+            super.onCreate(savedInstanceState);
-+            finish();
-+            return;
-+        }
-         final long intentReceivedTime = System.currentTimeMillis();
-         // This is the only place this value is being set. Effectively final.
-         mIsAppPredictorComponentAvailable = isAppPredictionServiceAvailable();

Patches/LineageOS-17.1/android_frameworks_base/405518.patch

@@ -1,8 +1,8 @@
-From 5fe06ebbd23db602bb46ba51a7e40711d7823be6 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Sumedh Sen <sumedhsen@google.com>
 Date: Wed, 17 Jul 2024 01:00:55 +0000
-Subject: [PATCH] [RESTRICT AUTOMERGE] Check whether installerPackageName
+Subject: [PATCH] Check whether installerPackageName contains only valid
- contains only valid characters
+ characters
 
 Bug: 341256391
 Bug: 307532206
@@ -15,10 +15,10 @@ Change-Id: I74a172c617d6f5b13f0708092156b657b73b5891
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java
-index 7e67021e3b847..ab8cc4c8d6697 100644
+index 8715b183d142..6c77a9575dcb 100644
 --- a/services/core/java/com/android/server/pm/PackageInstallerService.java
 +++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
-@@ -580,12 +580,17 @@ private int createSessionInternal(SessionParams params, String installerPackageN
+@@ -549,12 +549,17 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
          params.appLabel = TextUtils.trimToSize(params.appLabel,
                  PackageItemInfo.MAX_SAFE_LABEL_LENGTH);
  

Patches/LineageOS-17.1/android_libcore/405541.patch

@@ -1,4 +1,4 @@
-From 1e0f995b0b68d811d4225e73426c4c6350a506ad Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Almaz Mingaleev <mingaleev@google.com>
 Date: Wed, 10 Jul 2024 13:38:35 +0100
 Subject: [PATCH] Do not accept zip files with invalid headers.
@@ -30,7 +30,7 @@ Change-Id: I545cdd49ec3cc138331145f4716c8148662a478b
  1 file changed, 11 insertions(+)
 
 diff --git a/ojluni/src/main/native/zip_util.c b/ojluni/src/main/native/zip_util.c
-index aa9c5cede9e..16951a78ede 100644
+index 6c02d2bc73b..475be3afd9d 100644
 --- a/ojluni/src/main/native/zip_util.c
 +++ b/ojluni/src/main/native/zip_util.c
 @@ -878,6 +878,17 @@ ZIP_Put_In_Cache0(const char *name, ZFILE zfd, char **pmsg, jlong lastModified,

Patches/LineageOS-17.1/android_packages_apps_Bluetooth/0001-constify_JNINativeMethod.patch

@@ -177,10 +177,10 @@ index 403e90403..0b792c974 100644
      {"initNative", "()V", (void*)initNative},
      {"cleanupNative", "()V", (void*)cleanupNative},
 diff --git a/jni/com_android_bluetooth_hid_host.cpp b/jni/com_android_bluetooth_hid_host.cpp
-index 7838ff6ce..9b233c654 100644
+index 60fffc2f3..a709c8479 100644
 --- a/jni/com_android_bluetooth_hid_host.cpp
 +++ b/jni/com_android_bluetooth_hid_host.cpp
-@@ -498,7 +498,7 @@ static jboolean setIdleTimeNative(JNIEnv* env, jobject object,
+@@ -500,7 +500,7 @@ static jboolean setIdleTimeNative(JNIEnv* env, jobject object,
    return status == BT_STATUS_SUCCESS ? JNI_TRUE : JNI_FALSE;
  }
  

Patches/LineageOS-17.1/android_packages_apps_Bluetooth/405835-backport.patch

@@ -1,8 +1,7 @@
-From 6799e4b038c33ce3fd175749ebdea69379a5489f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Himanshu Rawat <rwt@google.com>
 Date: Mon, 8 Apr 2024 19:44:45 +0000
-Subject: [PATCH] RESTRICT AUTOMERGE Disallow unexpected incoming HID
+Subject: [PATCH] Disallow unexpected incoming HID connections 2/2
- connections 2/2
 
 HID profile accepted any new incoming HID connection. Even when the
 connection policy disabled HID connection, remote devices could initiate
@@ -25,10 +24,10 @@ Change-Id: I1d7e886b1045d026f96c8274aca86dc499f87777
  2 files changed, 10 insertions(+), 5 deletions(-)
 
 diff --git a/jni/com_android_bluetooth_hid_host.cpp b/jni/com_android_bluetooth_hid_host.cpp
-index cab5e3361..22c7dcfe8 100644
+index 7838ff6ce..60fffc2f3 100644
 --- a/jni/com_android_bluetooth_hid_host.cpp
 +++ b/jni/com_android_bluetooth_hid_host.cpp
-@@ -284,7 +284,8 @@ static jboolean connectHidNative(JNIEnv* env, jobject object,
+@@ -276,7 +276,8 @@ static jboolean connectHidNative(JNIEnv* env, jobject object,
  }
  
  static jboolean disconnectHidNative(JNIEnv* env, jobject object,
@@ -38,7 +37,7 @@ index cab5e3361..22c7dcfe8 100644
    jbyte* addr;
    jboolean ret = JNI_TRUE;
    if (!sBluetoothHidInterface) return JNI_FALSE;
-@@ -295,7 +296,8 @@ static jboolean disconnectHidNative(JNIEnv* env, jobject object,
+@@ -287,7 +288,8 @@ static jboolean disconnectHidNative(JNIEnv* env, jobject object,
      return JNI_FALSE;
    }
  
@@ -48,7 +47,7 @@ index cab5e3361..22c7dcfe8 100644
    if (status != BT_STATUS_SUCCESS) {
      ALOGE("Failed disconnect hid channel, status: %d", status);
      ret = JNI_FALSE;
-@@ -511,7 +513,7 @@ static JNINativeMethod sMethods[] = {
+@@ -503,7 +505,7 @@ static JNINativeMethod sMethods[] = {
      {"initializeNative", "()V", (void*)initializeNative},
      {"cleanupNative", "()V", (void*)cleanupNative},
      {"connectHidNative", "([B)Z", (void*)connectHidNative},
@@ -58,22 +57,22 @@ index cab5e3361..22c7dcfe8 100644
      {"virtualUnPlugNative", "([B)Z", (void*)virtualUnPlugNative},
      {"setProtocolModeNative", "([BB)Z", (void*)setProtocolModeNative},
 diff --git a/src/com/android/bluetooth/hid/HidHostService.java b/src/com/android/bluetooth/hid/HidHostService.java
-index 10d414d46..ed35c2908 100644
+index c378f8e89..fea167148 100644
 --- a/src/com/android/bluetooth/hid/HidHostService.java
 +++ b/src/com/android/bluetooth/hid/HidHostService.java
-@@ -161,7 +161,10 @@ public void handleMessage(Message msg) {
+@@ -157,7 +157,10 @@ public class HidHostService extends ProfileService {
                  break;
                  case MESSAGE_DISCONNECT: {
                      BluetoothDevice device = (BluetoothDevice) msg.obj;
 -                    if (!disconnectHidNative(Utils.getByteAddress(device))) {
-+                    int connectionPolicy = getConnectionPolicy(device);
++                    int connectionPolicy = getPriority(device);
 +                    boolean reconnectAllowed =
-+                            connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED;
++                            connectionPolicy == BluetoothProfile.PRIORITY_ON;
 +                    if (!disconnectHidNative(Utils.getByteAddress(device), reconnectAllowed)) {
                          broadcastConnectionState(device, BluetoothProfile.STATE_DISCONNECTING);
                          broadcastConnectionState(device, BluetoothProfile.STATE_DISCONNECTED);
                          break;
-@@ -934,7 +937,7 @@ public void dump(StringBuilder sb) {
+@@ -871,7 +874,7 @@ public class HidHostService extends ProfileService {
  
      private native boolean connectHidNative(byte[] btAddress);
  

Patches/LineageOS-17.1/android_packages_apps_Settings/403302.patch

@@ -1,4 +1,4 @@
-From c766d2a2d50d579c4b711d1cacd2677e0afcf1a4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chaohui Wang <chaohuiw@google.com>
 Date: Thu, 2 Nov 2023 11:43:00 +0800
 Subject: [PATCH] Limit wifi item edit content's max length to 500

Patches/LineageOS-17.1/android_packages_apps_Settings/403303.patch

@@ -1,4 +1,4 @@
-From e8fcd9986114b673068e77ad14202edc2b6aaaf5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jason Chiu <chiujason@google.com>
 Date: Wed, 31 Jan 2024 16:29:01 +0800
 Subject: [PATCH] Replace getCallingActivity() with getLaunchedFromPackage()
@@ -54,7 +54,7 @@ index 63bf420c027..3a62ddfb67e 100644
  import com.android.settingslib.search.SearchIndexableResources;
  import com.android.settingslib.search.SearchIndexableResourcesMobile;
  
-@@ -32,26 +33,23 @@
+@@ -32,26 +33,23 @@ import com.android.settingslib.search.SearchIndexableResourcesMobile;
   */
  public class SearchFeatureProviderImpl implements SearchFeatureProvider {
  
@@ -90,7 +90,7 @@ index 63bf420c027..3a62ddfb67e 100644
      }
  
      @Override
-@@ -69,7 +67,7 @@ public Intent buildSearchIntent(Context context, int pageId) {
+@@ -69,7 +67,7 @@ public class SearchFeatureProviderImpl implements SearchFeatureProvider {
                  .putExtra(Intent.EXTRA_REFERRER, buildReferrer(context, pageId));
      }
  
@@ -103,7 +103,7 @@ diff --git a/src/com/android/settings/search/SearchResultTrampoline.java b/src/c
 index 3bbe6bd58a7..3a14e874eae 100644
 --- a/src/com/android/settings/search/SearchResultTrampoline.java
 +++ b/src/com/android/settings/search/SearchResultTrampoline.java
-@@ -19,8 +19,10 @@
+@@ -19,8 +19,10 @@ package com.android.settings.search;
  import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS;
  
  import android.app.Activity;
@@ -137,7 +137,7 @@ diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProvid
 index 444a8137889..ebd935d3406 100644
 --- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
 +++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
-@@ -21,7 +21,6 @@
+@@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat;
  
  import android.app.Activity;
  import android.app.settings.SettingsEnums;
@@ -145,7 +145,7 @@ index 444a8137889..ebd935d3406 100644
  import android.content.Intent;
  import android.content.pm.ActivityInfo;
  import android.content.pm.ResolveInfo;
-@@ -126,20 +125,22 @@ public void verifyLaunchSearchResultPageCaller_nullCaller_shouldCrash() {
+@@ -126,20 +125,22 @@ public class SearchFeatureProviderImplTest {
  
      @Test(expected = SecurityException.class)
      public void verifyLaunchSearchResultPageCaller_badCaller_shouldCrash() {

Patches/LineageOS-17.1/android_packages_apps_Settings/403304.patch

@@ -1,4 +1,4 @@
-From 4e81f642c6aba3a4344d5973436655b94bb9f0d6 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chris Antol <cantol@google.com>
 Date: Tue, 4 Jun 2024 17:00:46 +0000
 Subject: [PATCH] Ignore fragment attr from ext authenticator resource
@@ -19,7 +19,7 @@ diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
 index c639d1df2eb..84386a38f08 100644
 --- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
 +++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
-@@ -32,6 +32,10 @@
+@@ -32,6 +32,10 @@ import android.os.UserHandle;
  import android.text.TextUtils;
  import android.util.Log;
  
@@ -30,7 +30,7 @@ index c639d1df2eb..84386a38f08 100644
  import androidx.preference.Preference;
  import androidx.preference.Preference.OnPreferenceClickListener;
  import androidx.preference.PreferenceFragmentCompat;
-@@ -45,6 +49,8 @@
+@@ -45,6 +49,8 @@ import com.android.settings.utils.LocalClassLoaderContextThemeWrapper;
  import com.android.settingslib.accounts.AuthenticatorHelper;
  import com.android.settingslib.core.instrumentation.Instrumentable;
  
@@ -39,7 +39,7 @@ index c639d1df2eb..84386a38f08 100644
  /**
   * Class to load the preference screen to be added to the settings page for the specific account
   * type as specified in the account-authenticator.
-@@ -83,6 +89,7 @@ public PreferenceScreen addPreferencesForType(final String accountType,
+@@ -83,6 +89,7 @@ public class AccountTypePreferenceLoader {
              try {
                  desc = mAuthenticatorHelper.getAccountTypeDescription(accountType);
                  if (desc != null && desc.accountPreferencesId != 0) {
@@ -47,7 +47,7 @@ index c639d1df2eb..84386a38f08 100644
                      // Load the context of the target package, then apply the
                      // base Settings theme (no references to local resources)
                      // and create a context theme wrapper so that we get the
-@@ -98,6 +105,12 @@ public PreferenceScreen addPreferencesForType(final String accountType,
+@@ -98,6 +105,12 @@ public class AccountTypePreferenceLoader {
                      themedCtx.getTheme().setTo(baseTheme);
                      prefs = mFragment.getPreferenceManager().inflateFromResource(themedCtx,
                              desc.accountPreferencesId, parent);
@@ -60,7 +60,7 @@ index c639d1df2eb..84386a38f08 100644
                  }
              } catch (PackageManager.NameNotFoundException e) {
                  Log.w(TAG, "Couldn't load preferences.xml file from " + desc.packageName);
-@@ -182,6 +195,48 @@ public boolean onPreferenceClick(Preference preference) {
+@@ -182,6 +195,48 @@ public class AccountTypePreferenceLoader {
          }
      }
  

Patches/LineageOS-17.1/android_packages_apps_Settings/403305.patch

@@ -1,4 +1,4 @@
-From 31469a42bf69d10b697f74989e2516a3bcece609 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chris Antol <cantol@google.com>
 Date: Mon, 25 Mar 2024 23:49:35 +0000
 Subject: [PATCH] RESTRICT AUTOMERGE Restrict Settings Homepage prior to
@@ -20,7 +20,7 @@ diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/s
 index 5e6c54bb7c2..784c6a2ec9c 100644
 --- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
 +++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
-@@ -20,6 +20,7 @@
+@@ -20,6 +20,7 @@ import android.animation.LayoutTransition;
  import android.app.ActivityManager;
  import android.app.settings.SettingsEnums;
  import android.os.Bundle;
@@ -28,7 +28,7 @@ index 5e6c54bb7c2..784c6a2ec9c 100644
  import android.view.View;
  import android.widget.FrameLayout;
  import android.widget.ImageView;
-@@ -39,10 +40,22 @@
+@@ -39,10 +40,22 @@ import com.android.settings.overlay.FeatureFactory;
  
  public class SettingsHomepageActivity extends FragmentActivity {
  

Patches/LineageOS-17.1/android_packages_apps_Settings/405534.patch

@@ -1,4 +1,4 @@
-From da6ee7b698b7d4c4cbe56c70027904268b72d0f1 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Yiling Chuang <emilychuang@google.com>
 Date: Mon, 8 Jul 2024 03:09:50 +0000
 Subject: [PATCH] RESTRICT AUTOMERGE FRP bypass defense in App battery usage
@@ -24,7 +24,7 @@ diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/
 index e8d5f3330f2..d17642053e7 100644
 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
 +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
-@@ -210,6 +210,11 @@ public void onResume() {
+@@ -210,6 +210,11 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
          initPreference();
      }
  
@@ -40,7 +40,7 @@ diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsa
 index 8eeac8d26b0..37fa511beeb 100644
 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
 +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
-@@ -395,4 +395,9 @@ public void testInitPreference_hasCorrectSummary() {
+@@ -395,4 +395,9 @@ public class AdvancedPowerUsageDetailTest {
          assertThat(mForegroundPreference.getSummary().toString()).isEqualTo("Used for 0 min");
          assertThat(mBackgroundPreference.getSummary().toString()).isEqualTo("Active for 0 min");
      }

Patches/LineageOS-17.1/android_packages_services_Telecomm/403306.patch

@@ -1,4 +1,4 @@
-From 5aa0eae41483c8994e1771ace987c258a52f3bfc Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Grant Menke <grantmenke@google.com>
 Date: Thu, 25 Apr 2024 10:43:43 -0700
 Subject: [PATCH] DO NOT MERGE Unbind CS if connection is not created within 15
@@ -49,7 +49,7 @@ diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/t
 index ecc635997..699c9ffee 100644
 --- a/src/com/android/server/telecom/Call.java
 +++ b/src/com/android/server/telecom/Call.java
-@@ -313,6 +313,17 @@ public void onContactPhotoQueryComplete(Uri handle, CallerInfo callerInfo) {
+@@ -313,6 +313,17 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
      /** The state of the call. */
      private int mState;
  
@@ -67,7 +67,7 @@ index ecc635997..699c9ffee 100644
      /** The handle with which to establish this call. */
      private Uri mHandle;
  
-@@ -816,6 +827,19 @@ public ConnectionServiceFocusManager.ConnectionServiceFocus getConnectionService
+@@ -816,6 +827,19 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
          return mConnectionService;
      }
  
@@ -87,7 +87,7 @@ index ecc635997..699c9ffee 100644
      @VisibleForTesting
      public int getState() {
          return mState;
-@@ -1739,6 +1763,7 @@ public void handleCreateConnectionSuccess(
+@@ -1739,6 +1763,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
              CallIdMapper idMapper,
              ParcelableConnection connection) {
          Log.v(this, "handleCreateConnectionSuccessful %s", connection);
@@ -99,7 +99,7 @@ diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/
 index bd5e37f89..a69d725fd 100644
 --- a/src/com/android/server/telecom/ConnectionServiceWrapper.java
 +++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java
-@@ -37,6 +37,7 @@
+@@ -37,6 +37,7 @@ import android.telecom.ConnectionService;
  import android.telecom.DisconnectCause;
  import android.telecom.GatewayInfo;
  import android.telecom.Log;
@@ -107,7 +107,7 @@ index bd5e37f89..a69d725fd 100644
  import android.telecom.Logging.Session;
  import android.telecom.ParcelableConference;
  import android.telecom.ParcelableConnection;
-@@ -60,6 +61,11 @@
+@@ -60,6 +61,11 @@ import java.util.List;
  import java.util.Map;
  import java.util.Set;
  import java.util.concurrent.ConcurrentHashMap;
@@ -119,7 +119,7 @@ index bd5e37f89..a69d725fd 100644
  
  /**
   * Wrapper for {@link IConnectionService}s, handles binding to {@link IConnectionService} and keeps
-@@ -71,6 +77,11 @@
+@@ -71,6 +77,11 @@ import java.util.concurrent.ConcurrentHashMap;
  public class ConnectionServiceWrapper extends ServiceBinder implements
          ConnectionServiceFocusManager.ConnectionServiceFocus {
  
@@ -131,7 +131,7 @@ index bd5e37f89..a69d725fd 100644
      private final class Adapter extends IConnectionServiceAdapter.Stub {
  
          @Override
-@@ -82,6 +93,12 @@ public void handleCreateConnectionComplete(String callId, ConnectionRequest requ
+@@ -82,6 +93,12 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
              try {
                  synchronized (mLock) {
                      logIncoming("handleCreateConnectionComplete %s", callId);
@@ -144,7 +144,7 @@ index bd5e37f89..a69d725fd 100644
                      // Check status hints image for cross user access
                      if (connection.getStatusHints() != null) {
                          Icon icon = connection.getStatusHints().getIcon();
-@@ -1126,7 +1143,8 @@ public void setConferenceState(String callId, boolean isConference,
+@@ -1126,7 +1143,8 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
       * @param context The context.
       * @param userHandle The {@link UserHandle} to use when binding.
       */
@@ -154,7 +154,7 @@ index bd5e37f89..a69d725fd 100644
              ComponentName componentName,
              ConnectionServiceRepository connectionServiceRepository,
              PhoneAccountRegistrar phoneAccountRegistrar,
-@@ -1229,6 +1247,26 @@ public void onSuccess() {
+@@ -1229,6 +1247,26 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
                          .setRttPipeToInCall(call.getCsToInCallRttPipeForCs())
                          .build();
  
@@ -181,7 +181,7 @@ index bd5e37f89..a69d725fd 100644
                  try {
                      mServiceInterface.createConnection(
                              call.getConnectionManagerPhoneAccount(),
-@@ -1514,7 +1552,8 @@ void stopDtmfTone(Call call) {
+@@ -1514,7 +1552,8 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
          }
      }
  
@@ -191,7 +191,7 @@ index bd5e37f89..a69d725fd 100644
          if (mCallIdMapper.getCallId(call) == null) {
              mCallIdMapper.addCall(call);
          }
-@@ -1909,4 +1948,9 @@ public String toString() {
+@@ -1909,4 +1948,9 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
          sb.append("]");
          return sb.toString();
      }
@@ -205,7 +205,7 @@ diff --git a/src/com/android/server/telecom/LogUtils.java b/src/com/android/serv
 index 760d24e10..37afdb8f6 100644
 --- a/src/com/android/server/telecom/LogUtils.java
 +++ b/src/com/android/server/telecom/LogUtils.java
-@@ -87,6 +87,7 @@ public final static class Events {
+@@ -87,6 +87,7 @@ public class LogUtils {
          public static final String STOP_CALL_WAITING_TONE = "STOP_CALL_WAITING_TONE";
          public static final String START_CONNECTION = "START_CONNECTION";
          public static final String CREATE_CONNECTION_FAILED = "CREATE_CONNECTION_FAILED";
@@ -217,7 +217,7 @@ diff --git a/tests/src/com/android/server/telecom/tests/BasicCallTests.java b/te
 index 7889d0487..46aa758b8 100644
 --- a/tests/src/com/android/server/telecom/tests/BasicCallTests.java
 +++ b/tests/src/com/android/server/telecom/tests/BasicCallTests.java
-@@ -939,6 +939,7 @@ public void testOutgoingCallSelectPhoneAccountVideo() throws Exception {
+@@ -939,6 +939,7 @@ public class BasicCallTests extends TelecomSystemTest {
          call.setTargetPhoneAccount(mPhoneAccountA1.getAccountHandle());
          assert(call.isVideoCallingSupportedByPhoneAccount());
          assertEquals(VideoProfile.STATE_BIDIRECTIONAL, call.getVideoState());
@@ -225,7 +225,7 @@ index 7889d0487..46aa758b8 100644
      }
  
      /**
-@@ -962,6 +963,7 @@ public void testOutgoingCallSelectPhoneAccountNoVideo() throws Exception {
+@@ -962,6 +963,7 @@ public class BasicCallTests extends TelecomSystemTest {
          call.setTargetPhoneAccount(mPhoneAccountA2.getAccountHandle());
          assert(!call.isVideoCallingSupportedByPhoneAccount());
          assertEquals(VideoProfile.STATE_AUDIO_ONLY, call.getVideoState());
@@ -237,7 +237,7 @@ diff --git a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java b/
 index 7adc99aa3..6e9515008 100644
 --- a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java
 +++ b/tests/src/com/android/server/telecom/tests/CallsManagerTest.java
-@@ -36,10 +36,12 @@
+@@ -36,10 +36,12 @@ import static org.mockito.Mockito.timeout;
  import static org.mockito.Mockito.times;
  import static org.mockito.Mockito.verify;
  import static org.mockito.Mockito.when;
@@ -250,7 +250,7 @@ index 7adc99aa3..6e9515008 100644
  import android.os.Process;
  import android.os.SystemClock;
  import android.os.UserHandle;
-@@ -55,6 +57,7 @@
+@@ -55,6 +57,7 @@ import android.telephony.TelephonyManager;
  import android.test.suitebuilder.annotation.MediumTest;
  import android.test.suitebuilder.annotation.SmallTest;
  
@@ -258,7 +258,7 @@ index 7adc99aa3..6e9515008 100644
  import com.android.internal.telephony.CallerInfo;
  import com.android.server.telecom.AsyncRingtonePlayer;
  import com.android.server.telecom.Call;
-@@ -68,6 +71,7 @@
+@@ -68,6 +71,7 @@ import com.android.server.telecom.ClockProxy;
  import com.android.server.telecom.ConnectionServiceFocusManager;
  import com.android.server.telecom.ConnectionServiceFocusManager.ConnectionServiceFocusManagerFactory;
  import com.android.server.telecom.ConnectionServiceWrapper;
@@ -266,7 +266,7 @@ index 7adc99aa3..6e9515008 100644
  import com.android.server.telecom.DefaultDialerCache;
  import com.android.server.telecom.EmergencyCallHelper;
  import com.android.server.telecom.HeadsetMediaButton;
-@@ -90,6 +94,7 @@
+@@ -90,6 +94,7 @@ import com.android.server.telecom.WiredHeadsetManager;
  import com.android.server.telecom.bluetooth.BluetoothRouteManager;
  import com.android.server.telecom.bluetooth.BluetoothStateReceiver;
  
@@ -282,7 +282,7 @@ index 7adc99aa3..6e9515008 100644
  
      private CallsManager mCallsManager;
  
-@@ -240,6 +246,20 @@ public void setUp() throws Exception {
+@@ -240,6 +246,20 @@ public class CallsManagerTest extends TelecomTestCase {
                  eq(SIM_1_HANDLE), any())).thenReturn(SIM_1_ACCOUNT);
          when(mPhoneAccountRegistrar.getPhoneAccount(
                  eq(SIM_2_HANDLE), any())).thenReturn(SIM_2_ACCOUNT);
@@ -303,7 +303,7 @@ index 7adc99aa3..6e9515008 100644
      }
  
      @MediumTest
-@@ -1111,6 +1131,32 @@ public void testCrossUserCallRedirectionEndEarlyForIncapablePhoneAccount() {
+@@ -1111,6 +1131,32 @@ public class CallsManagerTest extends TelecomTestCase {
          assertTrue(argumentCaptor.getValue().contains("Unavailable phoneAccountHandle"));
      }
  
@@ -336,7 +336,7 @@ index 7adc99aa3..6e9515008 100644
      private Call addSpyCall() {
          return addSpyCall(SIM_2_HANDLE, CallState.ACTIVE);
      }
-@@ -1189,4 +1235,19 @@ private void setupMsimAccounts() {
+@@ -1189,4 +1235,19 @@ public class CallsManagerTest extends TelecomTestCase {
          when(mPhoneAccountRegistrar.getSimPhoneAccountsOfCurrentUser()).thenReturn(
                  new ArrayList<>(Arrays.asList(SIM_1_HANDLE, SIM_2_HANDLE)));
      }
@@ -360,7 +360,7 @@ diff --git a/tests/src/com/android/server/telecom/tests/ComponentContextFixture.
 index e6e8ba122..675913aa0 100644
 --- a/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java
 +++ b/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java
-@@ -549,6 +549,14 @@ public void addConnectionService(
+@@ -549,6 +549,14 @@ public class ComponentContextFixture implements TestFixture<Context> {
          mServiceInfoByComponentName.put(componentName, serviceInfo);
      }
  
@@ -375,7 +375,7 @@ index e6e8ba122..675913aa0 100644
      public void addInCallService(
              ComponentName componentName,
              IInCallService service)
-@@ -599,6 +607,12 @@ private void addService(String action, ComponentName name, IInterface service) {
+@@ -599,6 +607,12 @@ public class ComponentContextFixture implements TestFixture<Context> {
          mComponentNameByService.put(service, name);
      }
  

Patches/LineageOS-17.1/android_packages_services_Telecomm/403307.patch

@@ -1,4 +1,4 @@
-From b1f14158f389b0522a2eda4212344440dace65de Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Pranav Madapurmath <pmadapurmath@google.com>
 Date: Tue, 11 Jun 2024 15:51:39 +0000
 Subject: [PATCH] Unbind CallScreeningService when timeout reached.
@@ -30,7 +30,7 @@ diff --git a/src/com/android/server/telecom/CallScreeningServiceHelper.java b/sr
 index 89778e43a..5582a7da4 100644
 --- a/src/com/android/server/telecom/CallScreeningServiceHelper.java
 +++ b/src/com/android/server/telecom/CallScreeningServiceHelper.java
-@@ -185,6 +185,10 @@ public void onNullBinding(ComponentName name) {
+@@ -185,6 +185,10 @@ public class CallScreeningServiceHelper {
                              Log.w(TAG, "Cancelling call id process due to timeout");
                          }
                          mFuture.complete(null);

Patches/LineageOS-17.1/android_system_bt/403308.patch

@@ -1,4 +1,4 @@
-From f9f366e1227c0a46b54b959cd97851ca0b654501 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hansong Zhang <hsz@google.com>
 Date: Tue, 11 Aug 2020 12:39:26 -0700
 Subject: [PATCH] Clean up BTM_SEC_MODE
@@ -16,7 +16,7 @@ Change-Id: Ib567b050a3cd38e0f77f1b875476ad84c3e949fa
  2 files changed, 4 insertions(+), 29 deletions(-)
 
 diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
-index 72dc9a2ed4b..8a194f08d59 100644
+index 72dc9a2ed..8a194f08d 100644
 --- a/stack/btm/btm_sec.cc
 +++ b/stack/btm/btm_sec.cc
 @@ -591,7 +591,6 @@ static bool btm_sec_set_security_level(CONNECTION_TYPE conn_type,
@@ -126,7 +126,7 @@ index 72dc9a2ed4b..8a194f08d59 100644
        HCI_SSP_HOST_SUPPORTED(p_acl_cb->peer_lmp_feature_pages[1])) {
      p_dev_rec->sm4 = BTM_SM4_TRUE;
 diff --git a/stack/include/btm_api_types.h b/stack/include/btm_api_types.h
-index 0d3d7d4b689..21c97d53f29 100644
+index 0d3d7d4b6..21c97d53f 100644
 --- a/stack/include/btm_api_types.h
 +++ b/stack/include/btm_api_types.h
 @@ -1038,12 +1038,8 @@ typedef void(tBTM_ESCO_CBACK)(tBTM_ESCO_EVT event, tBTM_ESCO_EVT_DATA* p_data);

Patches/LineageOS-17.1/android_system_bt/403309.patch

@@ -1,4 +1,4 @@
-From 144792df6991b7e9b462b657f93d05fa45ca4d43 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chris Manton <cmanton@google.com>
 Date: Mon, 7 Sep 2020 09:37:31 -0700
 Subject: [PATCH] Add getters to
@@ -17,7 +17,7 @@ Change-Id: Ia024a6977d606714f7edc58ded09f82a95703324
  1 file changed, 60 insertions(+)
 
 diff --git a/stack/btm/btm_int_types.h b/stack/btm/btm_int_types.h
-index a0460b1c0eb..e7450a5746d 100644
+index a0460b1c0..e7450a574 100644
 --- a/stack/btm/btm_int_types.h
 +++ b/stack/btm/btm_int_types.h
 @@ -516,6 +516,37 @@ typedef struct {

Patches/LineageOS-17.1/android_system_bt/403310.patch

@@ -1,4 +1,4 @@
-From e81da50d737fe764f9dc7852185d72a576a230ec Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chris Manton <cmanton@google.com>
 Date: Thu, 14 Jan 2021 14:04:09 -0800
 Subject: [PATCH] Add APIs stack/btm/security_device_record::
@@ -17,7 +17,7 @@ Change-Id: I820541c1f2fc86202710b7ef1bb5756ca9427851
  1 file changed, 4 insertions(+)
 
 diff --git a/stack/btm/btm_int_types.h b/stack/btm/btm_int_types.h
-index e7450a5746..a5bd894abd 100644
+index e7450a574..a5bd894ab 100644
 --- a/stack/btm/btm_int_types.h
 +++ b/stack/btm/btm_int_types.h
 @@ -475,6 +475,10 @@ typedef struct {

Patches/LineageOS-17.1/android_system_bt/403311.patch

@@ -1,4 +1,4 @@
-From 0690014ef4e8b810871c91372d61fd59f2f2f60e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chris Manton <cmanton@google.com>
 Date: Fri, 1 Jan 2021 19:11:49 -0800
 Subject: [PATCH] Add tACL_CONN::SupportsSecureConnections
@@ -15,7 +15,7 @@ Change-Id: I4ede2886aa5d90bfab8fccea5edaed70ad1514e7
  1 file changed, 12 insertions(+)
 
 diff --git a/stack/btm/btm_int_types.h b/stack/btm/btm_int_types.h
-index a5bd894abd..3ca1182d54 100644
+index a5bd894ab..3ca1182d5 100644
 --- a/stack/btm/btm_int_types.h
 +++ b/stack/btm/btm_int_types.h
 @@ -578,7 +578,19 @@ typedef struct {

Patches/LineageOS-17.1/android_system_bt/403312.patch

@@ -1,4 +1,4 @@
-From 9aa51330f13f42da60f0641b7ece6818690151d4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chris Manton <cmanton@google.com>
 Date: Fri, 1 Jan 2021 19:12:36 -0800
 Subject: [PATCH] Use tACL_CONN::SupportsSecureConnections
@@ -15,7 +15,7 @@ Change-Id: I7bfe087dcc28cfaeb492db1e1a6ec276e1e29ce2
  1 file changed, 9 insertions(+), 13 deletions(-)
 
 diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
-index 8a194f08d5..bd11381abb 100644
+index 8a194f08d..bd11381ab 100644
 --- a/stack/btm/btm_sec.cc
 +++ b/stack/btm/btm_sec.cc
 @@ -1727,7 +1727,7 @@ bool BTM_PeerSupportsSecureConnections(const RawAddress& bd_addr) {

Patches/LineageOS-17.1/android_system_bt/403313.patch

@@ -1,4 +1,4 @@
-From 060dad70cc532963ab0ff727aa8aebf8f8424beb Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hansong Zhang <hsz@google.com>
 Date: Tue, 20 Oct 2020 18:48:52 -0700
 Subject: [PATCH] Refactor btm_sec_set_peer_sec_caps
@@ -16,7 +16,7 @@ Change-Id: I7cb1bae627c731106ab3a93442acb8f6bb2018fa
  3 files changed, 17 insertions(+), 7 deletions(-)
 
 diff --git a/stack/btm/btm_acl.cc b/stack/btm/btm_acl.cc
-index 55772e69883..4717a95d7b2 100644
+index 55772e698..4717a95d7 100644
 --- a/stack/btm/btm_acl.cc
 +++ b/stack/btm/btm_acl.cc
 @@ -261,7 +261,13 @@ void btm_acl_created(const RawAddress& bda, DEV_CLASS dc, BD_NAME bdn,
@@ -49,7 +49,7 @@ index 55772e69883..4717a95d7b2 100644
    BTM_TRACE_API("%s: pend:%d", __func__, req_pend);
    if (req_pend) {
 diff --git a/stack/btm/btm_int.h b/stack/btm/btm_int.h
-index 05180db5eed..3ecca642245 100644
+index 05180db5e..3ecca6422 100644
 --- a/stack/btm/btm_int.h
 +++ b/stack/btm/btm_int.h
 @@ -258,7 +258,7 @@ extern void btm_sec_pin_code_request(const RawAddress& p_bda);
@@ -62,7 +62,7 @@ index 05180db5eed..3ecca642245 100644
  
  extern void btm_sec_clear_ble_keys(tBTM_SEC_DEV_REC* p_dev_rec);
 diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
-index bd11381abb2..150ab7daf6b 100644
+index bd11381ab..150ab7daf 100644
 --- a/stack/btm/btm_sec.cc
 +++ b/stack/btm/btm_sec.cc
 @@ -5770,14 +5770,13 @@ static bool btm_sec_queue_encrypt_request(const RawAddress& bd_addr,

Patches/LineageOS-17.1/android_system_bt/403314.patch

@@ -1,4 +1,4 @@
-From b13614438f7619007dd09a0805bbaf21db27c8b1 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hansong Zhang <hsz@google.com>
 Date: Thu, 29 Oct 2020 20:29:14 -0700
 Subject: [PATCH] Use btm_sec_set_peer_sec_caps to store features
@@ -14,7 +14,7 @@ Change-Id: If9aba469bceb3d45ccd566dba0ec9c445f2a8102
  3 files changed, 12 insertions(+), 10 deletions(-)
 
 diff --git a/stack/btm/btm_acl.cc b/stack/btm/btm_acl.cc
-index 4717a95d7b..14390482e2 100644
+index 4717a95d7..14390482e 100644
 --- a/stack/btm/btm_acl.cc
 +++ b/stack/btm/btm_acl.cc
 @@ -260,13 +260,12 @@ void btm_acl_created(const RawAddress& bda, DEV_CLASS dc, BD_NAME bdn,
@@ -50,7 +50,7 @@ index 4717a95d7b..14390482e2 100644
    BTM_TRACE_API("%s: pend:%d", __func__, req_pend);
    if (req_pend) {
 diff --git a/stack/btm/btm_int.h b/stack/btm/btm_int.h
-index 3ecca64224..b5205aa43f 100644
+index 3ecca6422..b5205aa43 100644
 --- a/stack/btm/btm_int.h
 +++ b/stack/btm/btm_int.h
 @@ -258,8 +258,8 @@ extern void btm_sec_pin_code_request(const RawAddress& p_bda);
@@ -65,7 +65,7 @@ index 3ecca64224..b5205aa43f 100644
  extern void btm_sec_clear_ble_keys(tBTM_SEC_DEV_REC* p_dev_rec);
  extern bool btm_sec_is_a_bonded_dev(const RawAddress& bda);
 diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
-index 150ab7daf6..dcf01745d6 100644
+index 150ab7daf..dcf01745d 100644
 --- a/stack/btm/btm_sec.cc
 +++ b/stack/btm/btm_sec.cc
 @@ -5770,8 +5770,12 @@ static bool btm_sec_queue_encrypt_request(const RawAddress& bd_addr,

Patches/LineageOS-17.1/android_system_bt/403315.patch

@@ -1,4 +1,4 @@
-From 0b49d63202e63201a10b1eb2d1e3943b73a8a7b5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Delwiche <delwiche@google.com>
 Date: Sat, 25 May 2024 00:28:41 +0000
 Subject: [PATCH] Add support for checking security downgrade
@@ -35,7 +35,7 @@ Change-Id: I8810c1bf9b3d3af1108cf621e2c51537e429c0f3
  5 files changed, 152 insertions(+), 1 deletion(-)
 
 diff --git a/btif/src/btif_storage.cc b/btif/src/btif_storage.cc
-index 2427493cd5b..200ea2c4e42 100644
+index 2427493cd..200ea2c4e 100644
 --- a/btif/src/btif_storage.cc
 +++ b/btif/src/btif_storage.cc
 @@ -84,7 +84,10 @@ using bluetooth::Uuid;
@@ -92,7 +92,7 @@ index 2427493cd5b..200ea2c4e42 100644
      default:
        BTIF_TRACE_ERROR("Unknow prop type:%d", prop->type);
 diff --git a/include/hardware/bluetooth.h b/include/hardware/bluetooth.h
-index cd070a7fb28..7de2bbe7a18 100644
+index cd070a7fb..7de2bbe7a 100644
 --- a/include/hardware/bluetooth.h
 +++ b/include/hardware/bluetooth.h
 @@ -262,6 +262,20 @@ typedef enum {
@@ -117,7 +117,7 @@ index cd070a7fb28..7de2bbe7a18 100644
  } bt_property_type_t;
  
 diff --git a/service/logging_helpers.cc b/service/logging_helpers.cc
-index 70f8720c6d8..17ebe952056 100644
+index 70f8720c6..17ebe9520 100644
 --- a/service/logging_helpers.cc
 +++ b/service/logging_helpers.cc
 @@ -117,6 +117,8 @@ const char* BtPropertyText(const bt_property_type_t prop) {
@@ -130,7 +130,7 @@ index 70f8720c6d8..17ebe952056 100644
        return "Invalid property";
    }
 diff --git a/stack/btm/btm_int.h b/stack/btm/btm_int.h
-index b5205aa43fc..971a02faa20 100644
+index b5205aa43..971a02faa 100644
 --- a/stack/btm/btm_int.h
 +++ b/stack/btm/btm_int.h
 @@ -238,6 +238,8 @@ extern void btm_sec_abort_access_req(const RawAddress& bd_addr);
@@ -151,7 +151,7 @@ index b5205aa43fc..971a02faa20 100644
                                          uint8_t res, bool is_le_trasnport);
  extern void btm_sec_set_peer_sec_caps(uint16_t hci_handle, bool ssp_supported,
 diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
-index dcf01745d6c..835a5d7c5bf 100644
+index dcf01745d..835a5d7c5 100644
 --- a/stack/btm/btm_sec.cc
 +++ b/stack/btm/btm_sec.cc
 @@ -220,6 +220,109 @@ static bool btm_serv_trusted(tBTM_SEC_DEV_REC* p_dev_rec,

Patches/LineageOS-17.1/android_system_bt/403316.patch

@@ -1,4 +1,4 @@
-From 53a4eb2e74169493aad8f4ea49ab1dc086a3513d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Delwiche <delwiche@google.com>
 Date: Fri, 31 May 2024 21:46:17 +0000
 Subject: [PATCH] Disallow connect with Secure Connections downgrade
@@ -25,7 +25,7 @@ Change-Id: I7b9dd1a18f1c04df88aabe89d4790fef9112da7e
  1 file changed, 16 insertions(+)
 
 diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
-index 835a5d7c5b..d5d698c274 100644
+index 835a5d7c5..d5d698c27 100644
 --- a/stack/btm/btm_sec.cc
 +++ b/stack/btm/btm_sec.cc
 @@ -4751,6 +4751,13 @@ void btm_sec_link_key_notification(const RawAddress& p_bda,

Patches/LineageOS-17.1/android_system_bt/403317.patch

@@ -1,4 +1,4 @@
-From ee89e827180526082add19d08c480b72e9324e2d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Delwiche <delwiche@google.com>
 Date: Fri, 31 May 2024 21:50:12 +0000
 Subject: [PATCH] Disallow connect with key length downgrade
@@ -31,7 +31,7 @@ Change-Id: I5b931ddb4876b529ed0c2e1138c02382291216ab
  1 file changed, 11 insertions(+)
 
 diff --git a/stack/btu/btu_hcif.cc b/stack/btu/btu_hcif.cc
-index 7bf385ea3d..615d3c6899 100644
+index 7bf385ea3..615d3c689 100644
 --- a/stack/btu/btu_hcif.cc
 +++ b/stack/btu/btu_hcif.cc
 @@ -1171,6 +1171,17 @@ static void read_encryption_key_size_complete_after_encryption_change(uint8_t st

Patches/LineageOS-17.1/android_system_bt/405536.patch

@@ -1,4 +1,4 @@
-From 935b7a26fa502de27c0cd3c97a05381319e8f22c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chris Manton <cmanton@google.com>
 Date: Sun, 14 Mar 2021 09:52:19 -0700
 Subject: [PATCH] Add btif/include/btif_hh::btif_hh_status_text
@@ -16,7 +16,7 @@ Change-Id: Iab6a4f33a3e498c33f4870abc5abd59e073d03f2
  1 file changed, 20 insertions(+), 1 deletion(-)
 
 diff --git a/btif/include/btif_hh.h b/btif/include/btif_hh.h
-index b71d347c1a7..f33598d2f19 100644
+index b71d347c1..f33598d2f 100644
 --- a/btif/include/btif_hh.h
 +++ b/btif/include/btif_hh.h
 @@ -46,7 +46,7 @@

Patches/LineageOS-17.1/android_system_bt/405834-backport.patch

@@ -1,7 +1,7 @@
-From 1017cfa02f11db8d077d5d7a32dd46da7c8b050b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Himanshu Rawat <rwt@google.com>
 Date: Mon, 8 Apr 2024 19:42:21 +0000
-Subject: [PATCH] [BACKPORT] Disallow unexpected incoming HID connections 1/2
+Subject: [PATCH] Disallow unexpected incoming HID connections 1/2
 
 HID profile accepted any new incoming HID connection. Even when the
 connection policy disabled HID connection, remote devices could initiate
@@ -21,13 +21,13 @@ Change-Id: I6e9db983e752dd498625078c13b736cd4c668806
 ---
  btif/include/btif_hh.h      |  4 +-
  btif/include/btif_storage.h | 23 ++++++++++
- btif/src/btif_hh.cc         | 87 ++++++++++++++++++++++++++++++++++---
+ btif/src/btif_hh.cc         | 86 ++++++++++++++++++++++++++++++++++---
- btif/src/btif_storage.cc    | 53 +++++++++++++++++++++-
+ btif/src/btif_storage.cc    | 53 ++++++++++++++++++++++-
  include/hardware/bt_hh.h    |  2 +-
- 5 files changed, 161 insertions(+), 8 deletions(-)
+ 5 files changed, 160 insertions(+), 8 deletions(-)
 
 diff --git a/btif/include/btif_hh.h b/btif/include/btif_hh.h
-index f33598d2f19..f93341d89f1 100644
+index f33598d2f..f93341d89 100644
 --- a/btif/include/btif_hh.h
 +++ b/btif/include/btif_hh.h
 @@ -97,6 +97,7 @@ typedef struct {
@@ -49,7 +49,7 @@ index f33598d2f19..f93341d89f1 100644
  extern void btif_hh_disconnect(RawAddress* bd_addr);
  extern void btif_hh_setreport(btif_hh_device_t* p_dev,
 diff --git a/btif/include/btif_storage.h b/btif/include/btif_storage.h
-index 1c1163d1428..362ffdc21bb 100644
+index 1c1163d14..362ffdc21 100644
 --- a/btif/include/btif_storage.h
 +++ b/btif/include/btif_storage.h
 @@ -178,6 +178,29 @@ bt_status_t btif_storage_remove_bonded_device(const RawAddress* remote_bd_addr);
@@ -83,18 +83,10 @@ index 1c1163d1428..362ffdc21bb 100644
   *
   * Function         btif_storage_add_hid_device_info
 diff --git a/btif/src/btif_hh.cc b/btif/src/btif_hh.cc
-index 97479e040ba..25fb151d260 100644
+index 5c57ee80c..b29b6773e 100644
 --- a/btif/src/btif_hh.cc
 +++ b/btif/src/btif_hh.cc
-@@ -42,6 +42,7 @@
+@@ -338,6 +338,24 @@ btif_hh_device_t* btif_hh_find_connected_dev_by_handle(uint8_t handle) {
- #include "btif_storage.h"
- #include "btif_util.h"
- #include "l2c_api.h"
-+#include "main/shim/dumpsys.h"
- #include "osi/include/log.h"
- #include "osi/include/osi.h"
- 
-@@ -334,6 +335,24 @@ btif_hh_device_t* btif_hh_find_connected_dev_by_handle(uint8_t handle) {
    return NULL;
  }
  
@@ -119,7 +111,7 @@ index 97479e040ba..25fb151d260 100644
  /*******************************************************************************
   *
   * Function         btif_hh_find_dev_by_bda
-@@ -419,7 +438,8 @@ void btif_hh_start_vup_timer(const RawAddress* bd_addr) {
+@@ -423,7 +441,8 @@ void btif_hh_start_vup_timer(const RawAddress* bd_addr) {
   *
   * Returns          true if add successfully, otherwise false.
   ******************************************************************************/
@@ -129,7 +121,7 @@ index 97479e040ba..25fb151d260 100644
    int i;
    for (i = 0; i < BTIF_HH_MAX_ADDED_DEV; i++) {
      if (btif_hh_cb.added_devices[i].bd_addr == bda) {
-@@ -433,6 +453,7 @@ bool btif_hh_add_added_dev(const RawAddress& bda, tBTA_HH_ATTR_MASK attr_mask) {
+@@ -437,6 +456,7 @@ bool btif_hh_add_added_dev(const RawAddress& bda, tBTA_HH_ATTR_MASK attr_mask) {
        btif_hh_cb.added_devices[i].bd_addr = bda;
        btif_hh_cb.added_devices[i].dev_handle = BTA_HH_INVALID_HANDLE;
        btif_hh_cb.added_devices[i].attr_mask = attr_mask;
@@ -137,7 +129,7 @@ index 97479e040ba..25fb151d260 100644
        return true;
      }
    }
-@@ -712,6 +733,23 @@ void btif_hh_getreport(btif_hh_device_t* p_dev, bthh_report_type_t r_type,
+@@ -715,6 +735,23 @@ void btif_hh_getreport(btif_hh_device_t* p_dev, bthh_report_type_t r_type,
   *
   ****************************************************************************/
  
@@ -146,11 +138,11 @@ index 97479e040ba..25fb151d260 100644
 +   * outgoing connection was requested */
 +  btif_hh_added_device_t* added_dev = btif_hh_find_added_dev(bda);
 +  if (added_dev != nullptr && added_dev->reconnect_allowed) {
-+    LOG_VERBOSE(LOG_TAG, "Connection allowed %s", PRIVATE_ADDRESS(bda));
++    LOG_VERBOSE(LOG_TAG, "Connection allowed %s", bda.ToString().c_str());
 +    return true;
 +  } else if (btif_hh_cb.pending_conn_address == bda) {
 +    LOG_VERBOSE(LOG_TAG, "Device connection was pending for: %s, status: %s",
-+                PRIVATE_ADDRESS(bda),
++                bda.ToString().c_str(),
 +                btif_hh_status_text(btif_hh_cb.status).c_str());
 +    return true;
 +  }
@@ -161,7 +153,7 @@ index 97479e040ba..25fb151d260 100644
  /*******************************************************************************
   *
   * Function         btif_hh_upstreams_evt
-@@ -770,9 +808,26 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) {
+@@ -773,9 +810,26 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) {
              p_data->status);
        break;
  
@@ -172,7 +164,7 @@ index 97479e040ba..25fb151d260 100644
 +
 +      if (!btif_hh_connection_allowed(p_data->conn.bda)) {
 +        LOG_WARN(LOG_TAG, "Reject Incoming HID Connection, device: %s",
-+                 PRIVATE_ADDRESS(p_data->conn.bda));
++                 p_data->conn.bda.ToString().c_str());
 +        btif_hh_device_t* p_dev =
 +            btif_hh_find_connected_dev_by_handle(p_data->conn.handle);
 +        if (p_dev != nullptr) {
@@ -189,7 +181,7 @@ index 97479e040ba..25fb151d260 100644
        btif_hh_cb.pending_conn_address = RawAddress::kEmpty;
        if (p_data->conn.status == BTA_HH_OK) {
          p_dev = btif_hh_find_connected_dev_by_handle(p_data->conn.handle);
-@@ -831,6 +886,7 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) {
+@@ -834,6 +888,7 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) {
          btif_hh_cb.status = (BTIF_HH_STATUS)BTIF_HH_DEV_DISCONNECTED;
        }
        break;
@@ -197,7 +189,7 @@ index 97479e040ba..25fb151d260 100644
  
      case BTA_HH_CLOSE_EVT:
        BTIF_TRACE_DEBUG("BTA_HH_CLOSE_EVT: status = %d, handle = %d",
-@@ -983,7 +1039,7 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) {
+@@ -986,7 +1041,7 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) {
                                  p_data->dscp_info.version,
                                  p_data->dscp_info.ctry_code, len,
                                  p_data->dscp_info.descriptor.dsc_list);
@@ -206,7 +198,7 @@ index 97479e040ba..25fb151d260 100644
            tBTA_HH_DEV_DSCP_INFO dscp_info;
            bt_status_t ret;
            btif_hh_copy_hid_info(&dscp_info, &p_data->dscp_info);
-@@ -999,6 +1055,8 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) {
+@@ -1002,6 +1057,8 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) {
                p_data->dscp_info.ssr_min_tout, len,
                p_data->dscp_info.descriptor.dsc_list);
  
@@ -215,7 +207,7 @@ index 97479e040ba..25fb151d260 100644
            ASSERTC(ret == BT_STATUS_SUCCESS, "storing hid info failed", ret);
            BTIF_TRACE_WARNING("BTA_HH_GET_DSCP_EVT: Called add device");
  
-@@ -1280,6 +1338,13 @@ static bt_status_t init(bthh_callbacks_t* callbacks) {
+@@ -1283,6 +1340,13 @@ static bt_status_t init(bthh_callbacks_t* callbacks) {
   ******************************************************************************/
  static bt_status_t connect(RawAddress* bd_addr) {
    if (btif_hh_cb.status != BTIF_HH_DEV_CONNECTING) {
@@ -229,7 +221,7 @@ index 97479e040ba..25fb151d260 100644
      btif_transfer_context(btif_hh_handle_evt, BTIF_HH_CONNECT_REQ_EVT,
                            (char*)bd_addr, sizeof(RawAddress), NULL);
      return BT_STATUS_SUCCESS;
-@@ -1296,7 +1361,7 @@ static bt_status_t connect(RawAddress* bd_addr) {
+@@ -1299,7 +1363,7 @@ static bt_status_t connect(RawAddress* bd_addr) {
   * Returns         bt_status_t
   *
   ******************************************************************************/
@@ -238,14 +230,14 @@ index 97479e040ba..25fb151d260 100644
    CHECK_BTHH_INIT();
    BTIF_TRACE_EVENT("BTHH: %s", __func__);
    btif_hh_device_t* p_dev;
-@@ -1306,6 +1371,17 @@ static bt_status_t disconnect(RawAddress* bd_addr) {
+@@ -1309,6 +1373,17 @@ static bt_status_t disconnect(RawAddress* bd_addr) {
                         btif_hh_cb.status);
      return BT_STATUS_FAIL;
    }
 +
 +  if (!reconnect_allowed) {
 +    LOG_INFO(LOG_TAG, "Incoming reconnections disabled for device %s",
-+             PRIVATE_ADDRESS((*bd_addr)));
++             bd_addr->ToString().c_str());
 +    btif_hh_added_device_t* added_dev = btif_hh_find_added_dev(*bd_addr);
 +    if (added_dev != nullptr && added_dev->reconnect_allowed) {
 +      added_dev->reconnect_allowed = false;
@@ -256,7 +248,7 @@ index 97479e040ba..25fb151d260 100644
    p_dev = btif_hh_find_connected_dev_by_bda(*bd_addr);
    if (p_dev != NULL) {
      return btif_transfer_context(btif_hh_handle_evt, BTIF_HH_DISCONNECT_REQ_EVT,
-@@ -1437,9 +1513,10 @@ static bt_status_t set_info(RawAddress* bd_addr, bthh_hid_info_t hid_info) {
+@@ -1440,9 +1515,10 @@ static bt_status_t set_info(RawAddress* bd_addr, bthh_hid_info_t hid_info) {
        (uint8_t*)osi_malloc(dscp_info.descriptor.dl_len);
    memcpy(dscp_info.descriptor.dsc_list, &(hid_info.dsc_list), hid_info.dl_len);
  
@@ -269,19 +261,19 @@ index 97479e040ba..25fb151d260 100644
  
    osi_free_and_reset((void**)&dscp_info.descriptor.dsc_list);
 diff --git a/btif/src/btif_storage.cc b/btif/src/btif_storage.cc
-index 95e4ef07150..8077ae55547 100644
+index 200ea2c4e..ecbf2b50a 100644
 --- a/btif/src/btif_storage.cc
 +++ b/btif/src/btif_storage.cc
-@@ -83,6 +83,8 @@ using bluetooth::Uuid;
+@@ -89,6 +89,8 @@ using bluetooth::Uuid;
- #define BTIF_STORAGE_KEY_LOCAL_IO_CAPS_BLE "LocalIOCapsBLE"
+ #define BTIF_STORAGE_KEY_SECURE_CONNECTIONS_SUPPORTED \
- #define BTIF_STORAGE_KEY_ADAPTER_DISC_TIMEOUT "DiscoveryTimeout"
+   "SecureConnectionsSupported"
  
 +#define BTIF_STORAGE_KEY_HID_RECONNECT_ALLOWED "HidReConnectAllowed"
 +
  /* This is a local property to add a device found */
  #define BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP 0xFF
  
-@@ -1323,6 +1325,50 @@ bt_status_t btif_storage_get_remote_addr_type(const RawAddress* remote_bd_addr,
+@@ -1353,6 +1355,50 @@ bt_status_t btif_storage_get_remote_addr_type(const RawAddress* remote_bd_addr,
        btif_config_get_int(remote_bd_addr->ToString(), "AddrType", addr_type);
    return ret ? BT_STATUS_SUCCESS : BT_STATUS_FAIL;
  }
@@ -332,7 +324,7 @@ index 95e4ef07150..8077ae55547 100644
  /*******************************************************************************
   *
   * Function         btif_storage_add_hid_device_info
-@@ -1425,8 +1471,12 @@ bt_status_t btif_storage_load_bonded_hid_info(void) {
+@@ -1455,8 +1501,12 @@ bt_status_t btif_storage_load_bonded_hid_info(void) {
  
      RawAddress bd_addr;
      RawAddress::FromString(name, bd_addr);
@@ -346,7 +338,7 @@ index 95e4ef07150..8077ae55547 100644
        BTA_HhAddDev(bd_addr, attr_mask, sub_class, app_id, dscp_info);
      }
    }
-@@ -1458,6 +1508,7 @@ bt_status_t btif_storage_remove_hid_info(RawAddress* remote_bd_addr) {
+@@ -1488,6 +1538,7 @@ bt_status_t btif_storage_remove_hid_info(RawAddress* remote_bd_addr) {
    btif_config_remove(bdstr, "HidSSRMaxLatency");
    btif_config_remove(bdstr, "HidSSRMinTimeout");
    btif_config_remove(bdstr, "HidDescriptor");
@@ -355,7 +347,7 @@ index 95e4ef07150..8077ae55547 100644
    return BT_STATUS_SUCCESS;
  }
 diff --git a/include/hardware/bt_hh.h b/include/hardware/bt_hh.h
-index b87b129bb12..923c6279216 100644
+index b87b129bb..923c62792 100644
 --- a/include/hardware/bt_hh.h
 +++ b/include/hardware/bt_hh.h
 @@ -154,7 +154,7 @@ typedef struct {

Patches/LineageOS-17.1/android_vendor_qcom_opensource_packages_apps_Bluetooth/405585-backport.patch

@@ -1,4 +1,4 @@
-From 0b906b1eef2156110bb753272fe133c096eb371b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Himanshu Rawat <rwt@google.com>
 Date: Mon, 8 Apr 2024 19:44:45 +0000
 Subject: [PATCH] RESTRICT AUTOMERGE Disallow unexpected incoming HID
@@ -59,34 +59,34 @@ index b8f4d6530..e4c885b3e 100644
      {"virtualUnPlugNative", "([B)Z", (void*)virtualUnPlugNative},
      {"setProtocolModeNative", "([BB)Z", (void*)setProtocolModeNative},
 diff --git a/src/com/android/bluetooth/hid/HidHostService.java b/src/com/android/bluetooth/hid/HidHostService.java
-index 4687bd6a1..0258f1fdd 100644
+index bbde61948..a830d07e1 100644
 --- a/src/com/android/bluetooth/hid/HidHostService.java
 +++ b/src/com/android/bluetooth/hid/HidHostService.java
-@@ -167,7 +167,10 @@ public void handleMessage(Message msg) {
+@@ -156,7 +156,10 @@ public class HidHostService extends ProfileService {
                  break;
                  case MESSAGE_DISCONNECT: {
                      BluetoothDevice device = (BluetoothDevice) msg.obj;
 -                    if (!disconnectHidNative(Utils.getByteAddress(device))) {
-+                    int connectionPolicy = getConnectionPolicy(device);
++                    int connectionPolicy = getPriority(device);
 +                    boolean reconnectAllowed =
-+                            connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED;
++                            connectionPolicy == BluetoothProfile.PRIORITY_ON;
 +                    if (!disconnectHidNative(Utils.getByteAddress(device), reconnectAllowed)) {
                          broadcastConnectionState(device, BluetoothProfile.STATE_DISCONNECTING);
                          broadcastConnectionState(device, BluetoothProfile.STATE_DISCONNECTED);
                          break;
-@@ -192,7 +195,10 @@ public void handleMessage(Message msg) {
+@@ -181,7 +184,10 @@ public class HidHostService extends ProfileService {
                              Log.d(TAG, "Incoming HID connection rejected");
                          }
                          if (disconnectRemote(device)) {
 -                            disconnectHidNative(Utils.getByteAddress(device));
-+                            int connectionPolicy = getConnectionPolicy(device);
++                            int connectionPolicy = getPriority(device);
 +                            boolean reconnectAllowed =
-+                                    connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED;
++                                    connectionPolicy == BluetoothProfile.PRIORITY_ON;
 +                            disconnectHidNative(Utils.getByteAddress(device), reconnectAllowed);
                          } else {
                              virtualUnPlugNative(Utils.getByteAddress(device));
                          }
-@@ -978,7 +984,7 @@ public void dump(StringBuilder sb) {
+@@ -906,7 +912,7 @@ public class HidHostService extends ProfileService {
  
      private native boolean connectHidNative(byte[] btAddress);
  

Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/403318.patch

@@ -1,4 +1,4 @@
-From a85afea964ff0589e474b816ffa941b371076af8 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hansong Zhang <hsz@google.com>
 Date: Tue, 11 Aug 2020 12:39:26 -0700
 Subject: [PATCH] Clean up BTM_SEC_MODE

Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/403319.patch

@@ -1,4 +1,4 @@
-From 7de7f2049c84e82c38435ab74396a19406e594a5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chris Manton <cmanton@google.com>
 Date: Mon, 7 Sep 2020 09:37:31 -0700
 Subject: [PATCH] Add getters to

Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/403320.patch

@@ -1,4 +1,4 @@
-From 8ae3462db2bac7543116b9951c339ba6cffa24de Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chris Manton <cmanton@google.com>
 Date: Thu, 14 Jan 2021 14:04:09 -0800
 Subject: [PATCH] Add APIs stack/btm/security_device_record::

Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/403321.patch

@@ -1,4 +1,4 @@
-From 901b9e1e71a53cb99dca8117b20e6e2f525008df Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chris Manton <cmanton@google.com>
 Date: Fri, 1 Jan 2021 19:11:49 -0800
 Subject: [PATCH] Add tACL_CONN::SupportsSecureConnections

Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/403322.patch

@@ -1,4 +1,4 @@
-From ba1d7096e640b401fd72dec3bc7f5683df317d38 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chris Manton <cmanton@google.com>
 Date: Fri, 1 Jan 2021 19:12:36 -0800
 Subject: [PATCH] Use tACL_CONN::SupportsSecureConnections

Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/403323.patch

@@ -1,4 +1,4 @@
-From 541a53f79d4342e25cbe4212a8192a8f7467b163 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hansong Zhang <hsz@google.com>
 Date: Tue, 20 Oct 2020 18:48:52 -0700
 Subject: [PATCH] Refactor btm_sec_set_peer_sec_caps

Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/403324.patch

@@ -1,4 +1,4 @@
-From a3b3bada1c107c7c97d776d4d1ba5f8602076737 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hansong Zhang <hsz@google.com>
 Date: Thu, 29 Oct 2020 20:29:14 -0700
 Subject: [PATCH] Use btm_sec_set_peer_sec_caps to store features

Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/403325.patch

@@ -1,4 +1,4 @@
-From e4fd09d4b7b1a4a4bd773b59f23f039d0fa877ca Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Delwiche <delwiche@google.com>
 Date: Sat, 25 May 2024 00:28:41 +0000
 Subject: [PATCH] Add support for checking security downgrade

Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/403326.patch

@@ -1,4 +1,4 @@
-From 667ea99b7d6d8985664c5f1866d20b824e360b07 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Delwiche <delwiche@google.com>
 Date: Fri, 31 May 2024 21:46:17 +0000
 Subject: [PATCH] Disallow connect with Secure Connections downgrade

Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/403327.patch

@@ -1,4 +1,4 @@
-From 51fa2abc7a900e24075bbd52b95c79be12e81ee2 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brian Delwiche <delwiche@google.com>
 Date: Fri, 31 May 2024 21:50:12 +0000
 Subject: [PATCH] Disallow connect with key length downgrade

Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/405583.patch

@@ -1,4 +1,4 @@
-From eb91d38c9e876c23d9a51ecc8bf9b55ad90c2c4d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Chris Manton <cmanton@google.com>
 Date: Sun, 14 Mar 2021 09:52:19 -0700
 Subject: [PATCH] Add btif/include/btif_hh::btif_hh_status_text

Patches/LineageOS-17.1/android_vendor_qcom_opensource_system_bt/405584.patch

@@ -1,4 +1,4 @@
-From 0196deeccce43dc7fc5d8c4bfe94d2f24ad2d4b2 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Himanshu Rawat <rwt@google.com>
 Date: Mon, 8 Apr 2024 19:42:21 +0000
 Subject: [PATCH] RESTRICT AUTOMERGE Disallow unexpected incoming HID
@@ -85,7 +85,7 @@ index b1ada4db6..a32b7b8ff 100755
   *
   * Function         btif_storage_add_hid_device_info
 diff --git a/btif/src/btif_hh.cc b/btif/src/btif_hh.cc
-index aeaabc47d..4ad1537d6 100644
+index b5135ff2f..0d184a646 100644
 --- a/btif/src/btif_hh.cc
 +++ b/btif/src/btif_hh.cc
 @@ -340,6 +340,24 @@ btif_hh_device_t* btif_hh_find_connected_dev_by_handle(uint8_t handle) {
@@ -191,7 +191,7 @@ index aeaabc47d..4ad1537d6 100644
  
      case BTA_HH_CLOSE_EVT:
        BTIF_TRACE_DEBUG("BTA_HH_CLOSE_EVT: status = %d, handle = %d",
-@@ -1021,7 +1076,7 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) {
+@@ -1017,7 +1072,7 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) {
              }
              return;
          }
@@ -200,7 +200,7 @@ index aeaabc47d..4ad1537d6 100644
            tBTA_HH_DEV_DSCP_INFO dscp_info;
            bt_status_t ret;
            btif_hh_copy_hid_info(&dscp_info, p_data->h_d_info.dscp_info);
-@@ -1037,6 +1092,8 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) {
+@@ -1033,6 +1088,8 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) {
                p_data->h_d_info.dscp_info->ssr_min_tout, len,
                p_data->h_d_info.dscp_info->descriptor.dsc_list);
  
@@ -209,7 +209,7 @@ index aeaabc47d..4ad1537d6 100644
            ASSERTC(ret == BT_STATUS_SUCCESS, "storing hid info failed", ret);
            BTIF_TRACE_WARNING("BTA_HH_GET_DSCP_EVT: Called add device");
  
-@@ -1334,6 +1391,13 @@ static bt_status_t connect(RawAddress* bd_addr) {
+@@ -1330,6 +1387,13 @@ static bt_status_t connect(RawAddress* bd_addr) {
      BTIF_TRACE_EVENT("%s Ignore connect request, device already connected", __func__);
      return BT_STATUS_SUCCESS;
    } else if (btif_hh_cb.status != BTIF_HH_DEV_CONNECTING) {
@@ -223,7 +223,7 @@ index aeaabc47d..4ad1537d6 100644
      btif_transfer_context(btif_hh_handle_evt, BTIF_HH_CONNECT_REQ_EVT,
                            (char*)bd_addr, sizeof(RawAddress), NULL);
      return BT_STATUS_SUCCESS;
-@@ -1350,7 +1414,7 @@ static bt_status_t connect(RawAddress* bd_addr) {
+@@ -1346,7 +1410,7 @@ static bt_status_t connect(RawAddress* bd_addr) {
   * Returns         bt_status_t
   *
   ******************************************************************************/
@@ -232,7 +232,7 @@ index aeaabc47d..4ad1537d6 100644
    CHECK_BTHH_INIT();
    BTIF_TRACE_EVENT("BTHH: %s", __func__);
    btif_hh_device_t* p_dev;
-@@ -1360,6 +1424,17 @@ static bt_status_t disconnect(RawAddress* bd_addr) {
+@@ -1356,6 +1420,17 @@ static bt_status_t disconnect(RawAddress* bd_addr) {
                         btif_hh_cb.status);
      return BT_STATUS_FAIL;
    }
@@ -250,7 +250,7 @@ index aeaabc47d..4ad1537d6 100644
    p_dev = btif_hh_find_connected_dev_by_bda(*bd_addr);
    if (p_dev != NULL) {
      return btif_transfer_context(btif_hh_handle_evt, BTIF_HH_DISCONNECT_REQ_EVT,
-@@ -1494,9 +1569,10 @@ static bt_status_t set_info(RawAddress* bd_addr, bthh_hid_info_t hid_info) {
+@@ -1490,9 +1565,10 @@ static bt_status_t set_info(RawAddress* bd_addr, bthh_hid_info_t hid_info) {
        (uint8_t*)osi_malloc(dscp_info.descriptor.dl_len);
    memcpy(dscp_info.descriptor.dsc_list, &(hid_info.dsc_list), hid_info.dl_len);
  
@@ -263,19 +263,19 @@ index aeaabc47d..4ad1537d6 100644
  
    osi_free_and_reset((void**)&dscp_info.descriptor.dsc_list);
 diff --git a/btif/src/btif_storage.cc b/btif/src/btif_storage.cc
-index d7a9cdf3c..0c40afd16 100644
+index a62d9da6d..db2091d9c 100644
 --- a/btif/src/btif_storage.cc
 +++ b/btif/src/btif_storage.cc
-@@ -88,6 +88,8 @@ using bluetooth::Uuid;
+@@ -91,6 +91,8 @@ using bluetooth::Uuid;
- #define BTIF_STORAGE_KEY_LOCAL_IO_CAPS_BLE "LocalIOCapsBLE"
+ #define BTIF_STORAGE_KEY_SECURE_CONNECTIONS_SUPPORTED \
- #define BTIF_STORAGE_KEY_ADAPTER_DISC_TIMEOUT "DiscoveryTimeout"
+   "SecureConnectionsSupported"
  
 +#define BTIF_STORAGE_KEY_HID_RECONNECT_ALLOWED "HidReConnectAllowed"
 +
  /* This is a local property to add a device found */
  #define BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP 0xFF
  
-@@ -1486,6 +1488,50 @@ bt_status_t btif_storage_get_remote_addr_type(const RawAddress* remote_bd_addr,
+@@ -1516,6 +1518,50 @@ bt_status_t btif_storage_get_remote_addr_type(const RawAddress* remote_bd_addr,
                                  addr_type);
    return ret ? BT_STATUS_SUCCESS : BT_STATUS_FAIL;
  }
@@ -326,7 +326,7 @@ index d7a9cdf3c..0c40afd16 100644
  /*******************************************************************************
   *
   * Function         btif_storage_add_hid_device_info
-@@ -1585,8 +1631,12 @@ bt_status_t btif_storage_load_bonded_hid_info(void) {
+@@ -1615,8 +1661,12 @@ bt_status_t btif_storage_load_bonded_hid_info(void) {
                                (uint8_t*)dscp_info.descriptor.dsc_list, &len);
          }
          RawAddress::FromString(name, bd_addr);
@@ -340,7 +340,7 @@ index d7a9cdf3c..0c40afd16 100644
            BTA_HhAddDev(bd_addr, attr_mask, sub_class, app_id, dscp_info);
          }
        }
-@@ -1626,6 +1676,7 @@ bt_status_t btif_storage_remove_hid_info(RawAddress* remote_bd_addr) {
+@@ -1656,6 +1706,7 @@ bt_status_t btif_storage_remove_hid_info(RawAddress* remote_bd_addr) {
    btif_config_remove(bdstr, "HidSSRMaxLatency");
    btif_config_remove(bdstr, "HidSSRMinTimeout");
    btif_config_remove(bdstr, "HidDescriptor");

Scripts/Common/Fix_CVE_Patchers.sh

@@ -53,7 +53,7 @@ commentPatches android_kernel_fxtec_msm8998.sh "0008-Graphene-Kernel_Hardening-s
 commentPatches android_kernel_fxtec_sm6115.sh "CVE-2018-5873" "CVE-2021-3444" "CVE-2021-3600";
 commentPatches android_kernel_google_bonito.sh "CVE-2020-0067";
 commentPatches android_kernel_google_coral.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-30324";
-commentPatches android_kernel_google_dragon.sh "0006-AndroidHardening-Kernel_Hardening/3.18/0026.patch" "0008-Graphene-Kernel_Hardening-ro" "CVE-2015-4167" "CVE-2017-15951" "CVE-2016-1237" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972" "CVE-2019-2214" "CVE-2021-39715/ANY/0001.patch";
+commentPatches android_kernel_google_dragon.sh "0006-AndroidHardening-Kernel_Hardening/3.18/0026.patch" "0008-Graphene-Kernel_Hardening-ro" "CVE-2015-4167" "CVE-2017-15951" "CVE-2016-1237" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972" "CVE-2019-2214" "CVE-2021-39715/ANY/0001.patch" "CVE-2024-46777";
 commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067";
 commentPatches android_kernel_google_gs101_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch" "CVE-2023-6817/5.10/0002.patch" "CVE-2023-52462/5.10/0002.patch" "CVE-2023-52672" "CVE-2024-26733/5.10/0002.patch" "CVE-2023-52656/5.10" "CVE-2024-26882" "CVE-2024-38564" "CVE-2022-48862" "CVE-2024-46681" "CVE-2024-46826";
 commentPatches android_kernel_google_gs201_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch" "CVE-2023-6817/5.10/0002.patch" "CVE-2023-52462/5.10/0002.patch" "CVE-2023-52672" "CVE-2024-26733/5.10/0002.patch" "CVE-2023-52656/5.10" "CVE-2024-26882" "CVE-2024-38564" "CVE-2022-48862" "CVE-2024-46681" "CVE-2024-46826";
@@ -106,7 +106,7 @@ commentPatches android_kernel_xiaomi_sm8150.sh "CVE-2020-24588/4.14/0018.patch"
 commentPatches android_kernel_xiaomi_vayu.sh "CVE-2020-24588/4.14/0018.patch";
 commentPatches android_kernel_xiaomi_sm6150.sh "CVE-2023-43550" "CVE-2023-52901";
 commentPatches android_kernel_xiaomi_sm8250.sh "CVE-2018-5873" "CVE-2020-1749" "CVE-2021-3444" "CVE-2021-3600" "CVE-2022-22075";
-commentPatches android_kernel_yandex_sdm660.sh "CVE-2019-11599" "CVE-2019-14070/ANY/0005.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166" "CVE-2024-35954";
+commentPatches android_kernel_yandex_sdm660.sh "CVE-2019-11599" "CVE-2019-14070/ANY/0005.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166" "CVE-2024-35954" "CVE-2023-28542" "CVE-2021-30319";
 commentPatches android_kernel_zte_msm8930.sh "CVE-2015-2922" "CVE-2017-11015/prima";
 commentPatches android_kernel_zte_msm8996.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "CVE-2017-13162" "CVE-2017-15951" "CVE-2017-16939" "CVE-2018-17972" "CVE-2019-2214" "CVE-2019-14070" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166" "CVE-2021-39715/ANY/0001.patch" "CVE-2022-42896/4.9";
 commentPatches android_kernel_zuk_msm8996.sh "0008-Graphene-Kernel_Hardening-slab" "0008-Graphene-Kernel_Hardening-canaries/4.4/0002.patch" "CVE-2019-19319" "CVE-2020-0305" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-1616";

Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh

@@ -1068,7 +1068,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46757/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46758/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46759/4.4/0008.patch
 #git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46771/^6.11/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46777/4.4/0008.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46777/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46781/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46830/^6.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46844/4.4/0008.patch

Scripts/LineageOS-15.1/Patch.sh

@@ -278,7 +278,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/399769-backport.patch"; #P_asb_
 applyPatch "$DOS_PATCHES/android_frameworks_base/399770.patch"; #P_asb_2024-08 Hide SAW subwindows
 applyPatch "$DOS_PATCHES/android_frameworks_base/401373-backport.patch"; #S_asb_2024-09 Sanitized uri scheme by removing scheme delimiter
 applyPatch "$DOS_PATCHES/android_frameworks_base/405829-backport.patch"; #P_asb_2024-10 Update AccountManagerService checkKeyIntent.
-+applyPatch "$DOS_PATCHES/android_frameworks_base/405830.patch"; #P_asb_2024-10 Fail parseUri if end is missing
+applyPatch "$DOS_PATCHES/android_frameworks_base/405830.patch"; #P_asb_2024-10 Fail parseUri if end is missing
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0001-Browser_No_Location.patch"; #Don't grant location permission to system browsers (GrapheneOS)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0003-SUPL_No_IMSI.patch"; #Don't send IMSI to SUPL (MSe1969)
 applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0004-Fingerprint_Lockout.patch"; #Enable fingerprint lockout after five failed attempts (GrapheneOS)

Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh

@@ -313,7 +313,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28964/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30319/qcacld-3.0/0001.patch --directory=drivers/staging/qcacld-3.0
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30319/qcacld-3.0/0001.patch --directory=drivers/staging/qcacld-3.0
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33656/4.4/0007.patch
@@ -631,7 +631,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-26545/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28328/4.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28542/qcacld-3.0/0001.patch --directory=drivers/staging/qcacld-3.0
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28542/qcacld-3.0/0001.patch --directory=drivers/staging/qcacld-3.0
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28584/4.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28772/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-30772/4.4/0008.patch

Scripts/LineageOS-17.1/Patch.sh

@@ -330,7 +330,6 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/402606.patch"; #Q_asb_2024-08 H
 applyPatch "$DOS_PATCHES/android_frameworks_base/403301.patch"; #Q_asb_2024-09 Sanitized uri scheme by removing scheme delimiter
 applyPatch "$DOS_PATCHES/android_frameworks_base/405515.patch"; #R_asb_2024-10 Update AccountManagerService checkKeyIntent.
 applyPatch "$DOS_PATCHES/android_frameworks_base/405516.patch"; #R_asb_2024-10 Fail parseUri if end is missing
-applyPatch "$DOS_PATCHES/android_frameworks_base/405517-backport.patch"; #R_asb_2024-10 Prevent Sharing when FRP enforcement is in effect
 applyPatch "$DOS_PATCHES/android_frameworks_base/405518.patch"; #R_asb_2024-10 Check whether installerPackageName contains only valid characters
 #applyPatch "$DOS_PATCHES/android_frameworks_base/272645.patch"; #ten-bt-sbc-hd-dualchannel: Add CHANNEL_MODE_DUAL_CHANNEL constant (ValdikSS)
 #applyPatch "$DOS_PATCHES/android_frameworks_base/272646-forwardport.patch"; #ten-bt-sbc-hd-dualchannel: Add Dual Channel into Bluetooth Audio Channel Mode developer options menu (ValdikSS)
@@ -468,7 +467,7 @@ fi;
 
 if enterAndClear "packages/apps/Bluetooth"; then
 applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/378135.patch"; #Q_asb_2023-12 Fix UAF in ~CallbackEnv
-applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/405540.patch"; #R_asb_2024-10 Disallow unexpected incoming HID connections 2/2
+applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/405835-backport.patch"; #P_asb_2024-10 Disallow unexpected incoming HID connections 2/2
 #applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/272652.patch"; #ten-bt-sbc-hd-dualchannel: SBC Dual Channel (SBC HD Audio) support (ValdikSS)
 #applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/272653.patch"; #ten-bt-sbc-hd-dualchannel: Assume optional codecs are supported if were supported previously (ValdikSS)
 applyPatch "$DOS_PATCHES/android_packages_apps_Bluetooth/0001-constify_JNINativeMethod.patch"; #Constify JNINativeMethod tables (GrapheneOS)
@@ -676,7 +675,7 @@ applyPatch "$DOS_PATCHES/android_system_bt/403315.patch"; #Q_asb_2024-09 Add sup
 applyPatch "$DOS_PATCHES/android_system_bt/403316.patch"; #Q_asb_2024-09 Disallow connect with Secure Connections downgrade
 applyPatch "$DOS_PATCHES/android_system_bt/403317.patch"; #Q_asb_2024-09 Disallow connect with key length downgrade
 applyPatch "$DOS_PATCHES/android_system_bt/405536.patch"; #R_asb_2024-10 Add btif/include/btif_hh::btif_hh_status_text
-applyPatch "$DOS_PATCHES/android_system_bt/405537.patch"; #R_asb_2024-10 Disallow unexpected incoming HID connections 1/2
+applyPatch "$DOS_PATCHES/android_system_bt/405834-backport.patch"; #P_asb_2024-10 Disallow unexpected incoming HID connections 1/2
 applyPatch "$DOS_PATCHES_COMMON/android_system_bt/0001-alloc_size.patch"; #Add alloc_size attributes to the allocator (GrapheneOS)
 #applyPatch "$DOS_PATCHES/android_system_bt/272648.patch"; #ten-bt-sbc-hd-dualchannel: Increase maximum Bluetooth SBC codec bitrate for SBC HD (ValdikSS)
 #applyPatch "$DOS_PATCHES/android_system_bt/272649.patch"; #ten-bt-sbc-hd-dualchannel: Explicit SBC Dual Channel (SBC HD) support (ValdikSS)
@@ -758,7 +757,7 @@ fi;
 
 if enterAndClear "vendor/qcom/opensource/commonsys/packages/apps/Bluetooth"; then
 applyPatch "$DOS_PATCHES/android_vendor_qcom_opensource_packages_apps_Bluetooth/378136.patch"; #Q_asb_2023-12 Fix UAF in ~CallbackEnv
-applyPatch "$DOS_PATCHES/android_vendor_qcom_opensource_packages_apps_Bluetooth/405585.patch"; #R_asb_2024-10 Disallow unexpected incoming HID connections 2/2
+applyPatch "$DOS_PATCHES/android_vendor_qcom_opensource_packages_apps_Bluetooth/405585-backport.patch"; #R_asb_2024-10 Disallow unexpected incoming HID connections 2/2
 fi;
 
 if enterAndClear "vendor/qcom/opensource/commonsys/system/bt"; then