Churn + Fixes

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

Patches/LineageOS-15.1/android_frameworks_av/399771.patch

@@ -1,4 +1,4 @@
-From 27b0b9e4ea4019f315bdb424a36b3182708de29f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Rakesh Kumar <rakesh.kumar@ittiam.com>
 Date: Thu, 30 May 2024 11:17:48 +0000
 Subject: [PATCH] StagefrightRecoder: Disabling B-frame support
@@ -21,10 +21,10 @@ Change-Id: I4098655eb9687fb633085333bc140634441566e6
  1 file changed, 5 insertions(+)
 
 diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
-index dfc4a2a5a9f..c81643e534d 100644
+index c58dcb9b08..641f98b9b9 100644
 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp
 +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
-@@ -1759,6 +1759,11 @@ status_t StagefrightRecorder::setupVideoEncoder(
+@@ -1725,6 +1725,11 @@ status_t StagefrightRecorder::setupVideoEncoder(
  
      if (tsLayers > 1) {
          uint32_t bLayers = std::min(2u, tsLayers - 1); // use up-to 2 B-layers

Patches/LineageOS-15.1/android_frameworks_base/399075-backport.patch

@@ -15,7 +15,7 @@ Change-Id: I96370cbd4f6a55f894c1a93307e5f82dfd394652
  3 files changed, 41 insertions(+), 8 deletions(-)
 
 diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java
-index a0fd43640e61..8dc3005ae81a 100644
+index 0af59c73b6d7..6484ebee8cd8 100644
 --- a/services/core/java/com/android/server/pm/ShortcutPackage.java
 +++ b/services/core/java/com/android/server/pm/ShortcutPackage.java
 @@ -19,17 +19,20 @@ import android.annotation.NonNull;
@@ -93,7 +93,7 @@ index a0fd43640e61..8dc3005ae81a 100644
          pw.println();
  
 diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
-index 83b817559c2a..d9e80fb1d0ad 100644
+index 7acb99c8270a..08aeef2b1b99 100644
 --- a/services/core/java/com/android/server/pm/ShortcutService.java
 +++ b/services/core/java/com/android/server/pm/ShortcutService.java
 @@ -302,7 +302,7 @@ public class ShortcutService extends IShortcutService.Stub {
@@ -105,7 +105,7 @@ index 83b817559c2a..d9e80fb1d0ad 100644
  
      private final IPackageManager mIPackageManager;
      private final PackageManagerInternal mPackageManagerInternal;
-@@ -2130,10 +2130,11 @@ public class ShortcutService extends IShortcutService.Stub {
+@@ -2134,10 +2134,11 @@ public class ShortcutService extends IShortcutService.Stub {
                      shortcutId, packageName, userId));
          }
  
@@ -118,7 +118,7 @@ index 83b817559c2a..d9e80fb1d0ad 100644
  
              if (ps.findShortcutById(shortcutId) == null) {
                  Log.w(TAG, String.format("reportShortcutUsed: package %s doesn't have shortcut %s",
-@@ -2142,12 +2143,7 @@ public class ShortcutService extends IShortcutService.Stub {
+@@ -2146,12 +2147,7 @@ public class ShortcutService extends IShortcutService.Stub {
              }
          }
  
@@ -133,10 +133,10 @@ index 83b817559c2a..d9e80fb1d0ad 100644
  
      @Override
 diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
-index 3220ea960f5d..48493df71dce 100644
+index 30c82350f45c..3372e9c6b664 100644
 --- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
 +++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java
-@@ -1867,6 +1867,8 @@ public class ShortcutManagerTest2 extends BaseShortcutManagerTest {
+@@ -1877,6 +1877,8 @@ public class ShortcutManagerTest2 extends BaseShortcutManagerTest {
  
      public void testReportShortcutUsed() {
          mRunningUsers.put(USER_10, true);

Patches/LineageOS-15.1/android_frameworks_base/399076.patch

@@ -1,4 +1,4 @@
-From a8d8d9bb68570d395ddb20449ee466e2b468840c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Pinyao Ting <pinyaoting@google.com>
 Date: Tue, 20 Jul 2021 00:01:29 +0000
 Subject: [PATCH] Prevend user spoofing in isRequestPinItemSupported
@@ -19,10 +19,10 @@ Change-Id: Icab7cdf25b870b88ecfde9b99e107bbeda0eb485
  1 file changed, 15 insertions(+)
 
 diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
-index c18cdcb891409..f4c8127439181 100644
+index 08aeef2b1b99..cd618cae5918 100644
 --- a/services/core/java/com/android/server/pm/ShortcutService.java
 +++ b/services/core/java/com/android/server/pm/ShortcutService.java
-@@ -1566,6 +1566,19 @@ void injectEnforceCallingPermission(
+@@ -1515,6 +1515,19 @@ public class ShortcutService extends IShortcutService.Stub {
          mContext.enforceCallingPermission(permission, message);
      }
  
@@ -42,7 +42,7 @@ index c18cdcb891409..f4c8127439181 100644
      private void verifyCaller(@NonNull String packageName, @UserIdInt int userId) {
          Preconditions.checkStringNotEmpty(packageName, "packageName");
  
-@@ -2303,6 +2316,8 @@ public void reportShortcutUsed(String packageName, String shortcutId, int userId
+@@ -2152,6 +2165,8 @@ public class ShortcutService extends IShortcutService.Stub {
  
      @Override
      public boolean isRequestPinItemSupported(int callingUserId, int requestType) {

Patches/LineageOS-15.1/android_frameworks_base/399770.patch

@@ -1,4 +1,4 @@
-From fe760134bfa7c0950b3474a3e5abfa0a3b7e53a7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Linus Tufvesson <lus@google.com>
 Date: Mon, 29 Apr 2024 16:32:15 +0200
 Subject: [PATCH] Hide SAW subwindows
@@ -17,10 +17,10 @@ Change-Id: If19240f5aec2e048de80d75cbbdc00be47622d7f
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
-index 087bd6a80c73d..74b2ef791ade6 100644
+index 77a8fec7241b..7eda006378b1 100644
 --- a/services/core/java/com/android/server/wm/WindowState.java
 +++ b/services/core/java/com/android/server/wm/WindowState.java
-@@ -2635,8 +2635,9 @@ boolean hideLw(boolean doAnimation, boolean requestAnim) {
+@@ -2558,8 +2558,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
      }
  
      void setForceHideNonSystemOverlayWindowIfNeeded(boolean forceHide) {

Patches/LineageOS-15.1/android_system_bt/399772-backport.patch

@@ -36,16 +36,16 @@ index e126e7cdd..58d1065a9 100644
 -  else if (p_btuuid->len == 4)
 -    return (bool)(p_btuuid->uu.uuid32 == p_attr->attr_value.v.u32);
 -  else if (!memcmp(p_btuuid->uu.uuid128, (void*)p_attr->attr_value.v.array,
-+  if (len == 2) {
-+    if (SDP_DISC_ATTR_LEN(p_attr->attr_len_type) == Uuid::kNumBytes16) {
++  if (p_btuuid->len == 2) {
++    if (SDP_DISC_ATTR_LEN(p_attr->attr_len_type) == 2) {
 +      return (bool)(p_btuuid->uu.uuid16 == p_attr->attr_value.v.u16);
 +    } else {
 +      LOG(ERROR) << "invalid length for discovery attribute";
 +      return (false);
 +    }
 +  }
-+  if (len == 4) {
-+    if (SDP_DISC_ATTR_LEN(p_attr->attr_len_type) == Uuid::kNumBytes32) {
++  if (p_btuuid->len == 4) {
++    if (SDP_DISC_ATTR_LEN(p_attr->attr_len_type) == 4) {
 +      return (bool)(p_btuuid->uu.uuid32 == p_attr->attr_value.v.u32);
 +    } else {
 +      LOG(ERROR) << "invalid length for discovery attribute";
@@ -53,7 +53,7 @@ index e126e7cdd..58d1065a9 100644
 +    }
 +  }
 +
-+  if (SDP_DISC_ATTR_LEN(p_attr->attr_len_type) != Uuid::kNumBytes128) {
++  if (SDP_DISC_ATTR_LEN(p_attr->attr_len_type) != 16) {
 +    LOG(ERROR) << "invalid length for discovery attribute";
 +    return (false);
 +  }