From 12b2241d24d9c700f9a05c9a5d448e06be1190e8 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 15 Aug 2023 22:44:13 +0800
Subject: [PATCH] Changes for August 2023

---
 ...MainActivity-Restore-applyThemeColor.patch | 34 -----------
 ...low-disabling-selected-local-command.patch | 56 +++++++++++++++++++
 2 files changed, 56 insertions(+), 34 deletions(-)
 delete mode 100644 patches_platform/packages_apps_Jelly/0001-Jelly-MainActivity-Restore-applyThemeColor.patch
 create mode 100644 patches_treble_prerequisite/packages_modules_Bluetooth/0001-Revert-gd-hci-Allow-disabling-selected-local-command.patch

diff --git a/patches_platform/packages_apps_Jelly/0001-Jelly-MainActivity-Restore-applyThemeColor.patch b/patches_platform/packages_apps_Jelly/0001-Jelly-MainActivity-Restore-applyThemeColor.patch
deleted file mode 100644
index 3e73742..0000000
--- a/patches_platform/packages_apps_Jelly/0001-Jelly-MainActivity-Restore-applyThemeColor.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b63b5c1fb46eaf032270bbb65b9a61fe487c5e46 Mon Sep 17 00:00:00 2001
-From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
-Date: Sat, 26 Jun 2021 14:23:09 +0000
-Subject: [PATCH] Jelly: MainActivity: Restore applyThemeColor
-
-Fixes black statusbar on start
-
-Change-Id: I6816f5b1dcb3c7bcaee2736a9e2a3ecd63217bc6
----
- app/src/main/java/org/lineageos/jelly/MainActivity.kt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/app/src/main/java/org/lineageos/jelly/MainActivity.kt b/app/src/main/java/org/lineageos/jelly/MainActivity.kt
-index 0143957..af7191c 100644
---- a/app/src/main/java/org/lineageos/jelly/MainActivity.kt
-+++ b/app/src/main/java/org/lineageos/jelly/MainActivity.kt
-@@ -192,6 +192,7 @@ class MainActivity : WebViewExtActivity(), SearchBarController.OnCancelListener,
-                 findViewById(R.id.search_menu_cancel),
-                 this)
-         setUiMode()
-+        applyThemeColor(mThemeColor)
-         try {
-             val httpCacheDir = File(cacheDir, "suggestion_responses")
-             val httpCacheSize = 1024 * 1024.toLong() // 1 MiB
-@@ -726,4 +727,4 @@ class MainActivity : WebViewExtActivity(), SearchBarController.OnCancelListener,
-         private const val STATE_KEY_THEME_COLOR = "theme_color"
-         private const val LOCATION_PERM_REQ = 424
-     }
--}
-\ No newline at end of file
-+}
--- 
-2.25.1
-
diff --git a/patches_treble_prerequisite/packages_modules_Bluetooth/0001-Revert-gd-hci-Allow-disabling-selected-local-command.patch b/patches_treble_prerequisite/packages_modules_Bluetooth/0001-Revert-gd-hci-Allow-disabling-selected-local-command.patch
new file mode 100644
index 0000000..f43abd4
--- /dev/null
+++ b/patches_treble_prerequisite/packages_modules_Bluetooth/0001-Revert-gd-hci-Allow-disabling-selected-local-command.patch
@@ -0,0 +1,56 @@
+From 23a01464fda098e3ec51ea34aaf040582dd98aaa Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Sun, 13 Aug 2023 16:00:17 +0800
+Subject: [PATCH] Revert "gd: hci: Allow disabling selected local commands"
+
+This reverts commit 2b932ba1ef8d2cafde548d7efa2c977a21eb0547.
+---
+ system/gd/hci/controller.cc | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/system/gd/hci/controller.cc b/system/gd/hci/controller.cc
+index 10023e3dd9..18f881369e 100644
+--- a/system/gd/hci/controller.cc
++++ b/system/gd/hci/controller.cc
+@@ -16,7 +16,6 @@
+ 
+ #include "hci/controller.h"
+ 
+-#include <android-base/strings.h>
+ #include <future>
+ #include <memory>
+ #include <string>
+@@ -26,14 +25,10 @@
+ #include "hci/hci_layer.h"
+ #include "hci_controller_generated.h"
+ #include "os/metrics.h"
+-#include "os/system_properties.h"
+ 
+ namespace bluetooth {
+ namespace hci {
+ 
+-static const char kPropertyDisabledCommands[] =
+-    "bluetooth.hci.disabled_commands";
+-
+ using os::Handler;
+ 
+ struct Controller::impl {
+@@ -265,15 +260,6 @@ struct Controller::impl {
+     ErrorCode status = complete_view.GetStatus();
+     ASSERT_LOG(status == ErrorCode::SUCCESS, "Status 0x%02hhx, %s", status, ErrorCodeText(status).c_str());
+     local_supported_commands_ = complete_view.GetSupportedCommands();
+-
+-    if (auto disabledCommands = os::GetSystemProperty(kPropertyDisabledCommands)) {
+-      for (const auto& command : android::base::Split(*disabledCommands, ",")) {
+-        uint16_t index = std::stoi(command);
+-        uint16_t byte_index = index / 10;
+-        uint16_t bit_index = index % 10;
+-        local_supported_commands_[byte_index] &= ~(1 << bit_index);
+-      }
+-    }
+   }
+ 
+   void read_local_extended_features_complete_handler(std::promise<void> promise, CommandCompleteView view) {
+-- 
+2.34.1
+