Regenerate patches

frameworks/base got too messy, time to clean it up
This commit is contained in:
Andy CrossGate Yan
2021-02-14 10:41:04 +00:00
parent 85c08ba1de
commit 79b5b414a7
150 changed files with 615 additions and 881 deletions
@@ -1,7 +1,7 @@
From fef557417bece64d452454b3263ce2a8d3661ff9 Mon Sep 17 00:00:00 2001
From c193d34f95234894a464164b180ce6ecca0a7eb3 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 20 Feb 2018 23:04:50 +0100
Subject: [PATCH 1/2] Make BTM_BYPASS_EXTRA_ACL_SETUP dynamic
Subject: [PATCH 1/3] Make BTM_BYPASS_EXTRA_ACL_SETUP dynamic
Change-Id: Icb0868566b29b053ed7e83c9fd32e225af3f2e46
---
@@ -26,7 +26,7 @@ index cf2c1136f..e2844db82 100644
/******************************************************************************
* Constants & Macros
diff --git a/internal_include/bt_target.h b/internal_include/bt_target.h
index 67a67c56d..3021ca37b 100644
index e33f0b580..83461b7f4 100644
--- a/internal_include/bt_target.h
+++ b/internal_include/bt_target.h
@@ -32,6 +32,9 @@
@@ -40,10 +40,10 @@ index 67a67c56d..3021ca37b 100644
#include "bt_types.h" /* This must be defined AFTER buildcfg.h */
diff --git a/stack/btm/btm_acl.cc b/stack/btm/btm_acl.cc
index dcb2fb4d9..5a6c3631e 100644
index 6daf2d23c..ed07e8105 100644
--- a/stack/btm/btm_acl.cc
+++ b/stack/btm/btm_acl.cc
@@ -1186,17 +1186,17 @@ void btm_read_remote_ext_features_failed(uint8_t status, uint16_t handle) {
@@ -1208,17 +1208,17 @@ void btm_read_remote_ext_features_failed(uint8_t status, uint16_t handle) {
void btm_establish_continue(tACL_CONN* p_acl_cb) {
tBTM_BL_EVENT_DATA evt_data;
BTM_TRACE_DEBUG("btm_establish_continue");
@@ -72,10 +72,10 @@ index dcb2fb4d9..5a6c3631e 100644
BTM_TRACE_ERROR("%s: Already link is up ", __func__);
return;
diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
index 4df0974dd..eb28b0a97 100644
index 1ff4eeddf..60b64bd79 100644
--- a/stack/btm/btm_sec.cc
+++ b/stack/btm/btm_sec.cc
@@ -4366,15 +4366,15 @@ void btm_sec_connected(const RawAddress& bda, uint16_t handle, uint8_t status,
@@ -4369,15 +4369,15 @@ void btm_sec_connected(const RawAddress& bda, uint16_t handle, uint8_t status,
if (p_acl_cb) {
/* whatever is in btm_establish_continue() without reporting the BTM_BL_CONN_EVT
* event */
@@ -101,5 +101,5 @@ index 4df0974dd..eb28b0a97 100644
btm_acl_created(bda, p_dev_rec->dev_class, p_dev_rec->sec_bd_name, handle,
HCI_ROLE_SLAVE, BT_TRANSPORT_BR_EDR);
--
2.17.1
2.25.1
@@ -1,7 +1,7 @@
From 9bc6c5d104edf78b5f795e17560ee4f8bb39a122 Mon Sep 17 00:00:00 2001
From d8a0d677ab02422b21a8490bea5189254cc76df0 Mon Sep 17 00:00:00 2001
From: penn5 <penn5@users.noreply.github.com>
Date: Mon, 4 Mar 2019 22:21:07 +0000
Subject: [PATCH 2/2] Add props to control supported features and states (#1)
Subject: [PATCH 2/3] Add props to control supported features and states (#1)
* Add bitmask for supported fields
Use persist.sys.bt.unsupport.states, defaults to 0, left-aligned.
@@ -23,7 +23,7 @@ HCI_LE_ENCRYPTION..HCI_LE_PERIODIC_ADVERTISING
1 file changed, 77 insertions(+)
diff --git a/hci/src/hci_packet_parser.cc b/hci/src/hci_packet_parser.cc
index b1efd444d..88dc4c6cd 100644
index 3f4e46cb4..9e39c1596 100644
--- a/hci/src/hci_packet_parser.cc
+++ b/hci/src/hci_packet_parser.cc
@@ -27,6 +27,8 @@
@@ -35,7 +35,7 @@ index b1efd444d..88dc4c6cd 100644
static const command_opcode_t NO_OPCODE_CHECKING = 0;
static const allocator_t* buffer_allocator;
@@ -108,6 +110,31 @@ static void parse_read_local_supported_commands_response(
@@ -122,6 +124,31 @@ static void parse_read_local_supported_commands_response(
buffer_allocator->free(response);
}
@@ -67,7 +67,7 @@ index b1efd444d..88dc4c6cd 100644
static void parse_read_local_extended_features_response(
BT_HDR* response, uint8_t* page_number_ptr, uint8_t* max_page_number_ptr,
bt_device_features_t* feature_pages, size_t feature_pages_count) {
@@ -123,6 +150,16 @@ static void parse_read_local_extended_features_response(
@@ -137,6 +164,16 @@ static void parse_read_local_extended_features_response(
STREAM_TO_ARRAY(feature_pages[*page_number_ptr].as_array, stream,
(int)sizeof(bt_device_features_t));
@@ -84,7 +84,7 @@ index b1efd444d..88dc4c6cd 100644
buffer_allocator->free(response);
}
@@ -148,6 +185,19 @@ static void parse_ble_read_buffer_size_response(BT_HDR* response,
@@ -162,6 +199,19 @@ static void parse_ble_read_buffer_size_response(BT_HDR* response,
buffer_allocator->free(response);
}
@@ -104,7 +104,7 @@ index b1efd444d..88dc4c6cd 100644
static void parse_ble_read_supported_states_response(
BT_HDR* response, uint8_t* supported_states, size_t supported_states_size) {
uint8_t* stream =
@@ -156,9 +206,30 @@ static void parse_ble_read_supported_states_response(
@@ -170,9 +220,30 @@ static void parse_ble_read_supported_states_response(
CHECK(stream != NULL);
STREAM_TO_ARRAY(supported_states, stream, (int)supported_states_size);
@@ -135,7 +135,7 @@ index b1efd444d..88dc4c6cd 100644
static void parse_ble_read_local_supported_features_response(
BT_HDR* response, bt_device_features_t* supported_features) {
uint8_t* stream = read_command_complete_header(
@@ -168,6 +239,12 @@ static void parse_ble_read_local_supported_features_response(
@@ -182,6 +253,12 @@ static void parse_ble_read_local_supported_features_response(
STREAM_TO_ARRAY(supported_features->as_array, stream,
(int)sizeof(bt_device_features_t));
@@ -149,5 +149,5 @@ index b1efd444d..88dc4c6cd 100644
}
--
2.17.1
2.25.1
@@ -1,4 +1,4 @@
From c43fc9cdeb2a41da244279ec86473e9504f4311b Mon Sep 17 00:00:00 2001
From 83293b39e918000818a87829ee6dc1803e953f18 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 25 May 2020 21:25:12 +0200
Subject: [PATCH 3/3] Add persist.sys.phh.disable_a2dp_offload property to
@@ -10,7 +10,7 @@ Subject: [PATCH 3/3] Add persist.sys.phh.disable_a2dp_offload property to
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/btif/src/btif_av.cc b/btif/src/btif_av.cc
index 24e32ec10..fa537ba4e 100644
index 14fabdbef..530c996d5 100644
--- a/btif/src/btif_av.cc
+++ b/btif/src/btif_av.cc
@@ -959,9 +959,14 @@ bt_status_t BtifAvSource::Init(
@@ -30,10 +30,10 @@ index 24e32ec10..fa537ba4e 100644
callbacks_ = callbacks;
bta_av_co_init(codec_priorities);
diff --git a/stack/a2dp/a2dp_codec_config.cc b/stack/a2dp/a2dp_codec_config.cc
index edf7e0c46..143eed7a3 100644
index 2480cdc66..6ddfb27fa 100644
--- a/stack/a2dp/a2dp_codec_config.cc
+++ b/stack/a2dp/a2dp_codec_config.cc
@@ -560,13 +560,18 @@ bool A2dpCodecs::init() {
@@ -564,13 +564,18 @@ bool A2dpCodecs::init() {
char* tok = NULL;
char* tmp_token = NULL;
bool offload_codec_support[BTAV_A2DP_CODEC_INDEX_MAX] = {false};
@@ -54,5 +54,5 @@ index edf7e0c46..143eed7a3 100644
if (a2dp_offload_status) {
char value_cap[PROPERTY_VALUE_MAX];
--
2.17.1
2.25.1