Changes for April 2022, syncing up to v412
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
From 2109e8f28ad6b0dd9ed1e6aea80d8f96bcfc6856 Mon Sep 17 00:00:00 2001
|
||||
From a194fe441f38c5844b1b40ad89dc8c46ce15283b Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Mon, 5 Aug 2019 18:09:50 +0200
|
||||
Subject: [PATCH 01/19] Fix BT in-call on CAF devices
|
||||
Subject: [PATCH 01/21] Fix BT in-call on CAF devices
|
||||
|
||||
See https://github.com/phhusson/treble_experimentations/issues/374
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From efb1576f000a7bf89e53381c5863dbe5e407f77e Mon Sep 17 00:00:00 2001
|
||||
From 60072fd9b20c55faca220cee207ac63a506690cb Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Tue, 1 Oct 2019 13:35:49 +0200
|
||||
Subject: [PATCH 02/19] Add (partial, cam id is hardcoded) support for Asus ZF6
|
||||
Subject: [PATCH 02/21] Add (partial, cam id is hardcoded) support for Asus ZF6
|
||||
motor camera
|
||||
|
||||
Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe
|
||||
@@ -11,7 +11,7 @@ Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe
|
||||
2 files changed, 29 insertions(+)
|
||||
|
||||
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
|
||||
index 04b56048e0..24b022226f 100644
|
||||
index b53aec100e..c24ff726ea 100644
|
||||
--- a/services/camera/libcameraservice/CameraService.cpp
|
||||
+++ b/services/camera/libcameraservice/CameraService.cpp
|
||||
@@ -26,6 +26,7 @@
|
||||
@@ -30,7 +30,7 @@ index 04b56048e0..24b022226f 100644
|
||||
mEventLog(DEFAULT_EVENT_LOG_LENGTH),
|
||||
mNumberOfCameras(0),
|
||||
mNumberOfCamerasWithoutSystemCamera(0),
|
||||
@@ -1874,6 +1876,7 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String8&
|
||||
@@ -1883,6 +1885,7 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String8&
|
||||
mServiceLock.lock();
|
||||
} else {
|
||||
// Otherwise, add client to active clients list
|
||||
@@ -38,7 +38,7 @@ index 04b56048e0..24b022226f 100644
|
||||
finishConnectLocked(client, partial, oomScoreOffset);
|
||||
}
|
||||
|
||||
@@ -1963,6 +1966,27 @@ status_t CameraService::addOfflineClient(String8 cameraId, sp<BasicClient> offli
|
||||
@@ -1972,6 +1975,27 @@ status_t CameraService::addOfflineClient(String8 cameraId, sp<BasicClient> offli
|
||||
return OK;
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ index 04b56048e0..24b022226f 100644
|
||||
Status CameraService::setTorchMode(const String16& cameraId, bool enabled,
|
||||
const sp<IBinder>& clientBinder) {
|
||||
Mutex::Autolock lock(mServiceLock);
|
||||
@@ -3054,6 +3078,8 @@ binder::Status CameraService::BasicClient::disconnect() {
|
||||
@@ -3060,6 +3084,8 @@ binder::Status CameraService::BasicClient::disconnect() {
|
||||
}
|
||||
mDisconnected = true;
|
||||
|
||||
@@ -76,10 +76,10 @@ index 04b56048e0..24b022226f 100644
|
||||
sCameraService->logDisconnected(mCameraIdStr, mClientPid, String8(mClientPackageName));
|
||||
sCameraService->mCameraProviderManager->removeRef(CameraProviderManager::DeviceMode::CAMERA,
|
||||
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
|
||||
index bc2e3479bc..b58c41e115 100644
|
||||
index 69e753b95f..13bc96e7c8 100644
|
||||
--- a/services/camera/libcameraservice/CameraService.h
|
||||
+++ b/services/camera/libcameraservice/CameraService.h
|
||||
@@ -211,6 +211,9 @@ public:
|
||||
@@ -219,6 +219,9 @@ public:
|
||||
// Register an offline client for a given active camera id
|
||||
status_t addOfflineClient(String8 cameraId, sp<BasicClient> offlineClient);
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 9f19a75cd2c476e071f61bea35d8f082943c3522 Mon Sep 17 00:00:00 2001
|
||||
From 0df456a123afa586fda489992bf2aabc569fff47 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Cai <peter@typeblog.net>
|
||||
Date: Thu, 23 Jan 2020 11:13:43 +0800
|
||||
Subject: [PATCH 03/19] audiopolicy: try again with trimmed audio port name if
|
||||
Subject: [PATCH 03/21] audiopolicy: try again with trimmed audio port name if
|
||||
not found
|
||||
|
||||
* In Spreadtrum BSP, some audio routes may contain ports with extra
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 94c8075354ae12fabd2c7c3cef2a3623bb38813f Mon Sep 17 00:00:00 2001
|
||||
From e20eeef0160a265369850933afca8308c1ae8d65 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Mon, 13 Apr 2020 21:01:16 +0200
|
||||
Subject: [PATCH 04/19] There are three SCO devices. Fallback from one to the
|
||||
Subject: [PATCH 04/21] There are three SCO devices. Fallback from one to the
|
||||
others if needed
|
||||
|
||||
Change-Id: I414dcb6b154855c00cb8520b23dc1069827864b2
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From d729bbcff505ed46d6e8251475d5662a4207d935 Mon Sep 17 00:00:00 2001
|
||||
From ec32f391f2e32d57996d633ca0ed69fe8a8a7702 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Thu, 14 May 2020 19:54:55 +0200
|
||||
Subject: [PATCH 05/19] Add persist.sys.phh.samsung.camera_ids property to
|
||||
Subject: [PATCH 05/21] Add persist.sys.phh.samsung.camera_ids property to
|
||||
access hidden Samsung cameras
|
||||
|
||||
Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593
|
||||
@@ -23,7 +23,7 @@ index 26562e0426..e940c33845 100644
|
||||
],
|
||||
|
||||
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
|
||||
index 4f2b878d26..d11ad8d766 100644
|
||||
index 0cce2cad91..52c78a4695 100644
|
||||
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
|
||||
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
|
||||
@@ -21,6 +21,7 @@
|
||||
@@ -34,7 +34,7 @@ index 4f2b878d26..d11ad8d766 100644
|
||||
|
||||
#include <algorithm>
|
||||
#include <chrono>
|
||||
@@ -1371,6 +1372,7 @@ status_t CameraProviderManager::ProviderInfo::initialize(
|
||||
@@ -1380,6 +1381,7 @@ status_t CameraProviderManager::ProviderInfo::initialize(
|
||||
mMinorVersion = 6;
|
||||
}
|
||||
}
|
||||
@@ -42,7 +42,7 @@ index 4f2b878d26..d11ad8d766 100644
|
||||
// We need to check again since cast2_6.isOk() succeeds even if the provider
|
||||
// version isn't actually 2.6.
|
||||
if (interface2_6 == nullptr){
|
||||
@@ -1407,6 +1409,9 @@ status_t CameraProviderManager::ProviderInfo::initialize(
|
||||
@@ -1416,6 +1418,9 @@ status_t CameraProviderManager::ProviderInfo::initialize(
|
||||
return mapToStatusT(status);
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ index 4f2b878d26..d11ad8d766 100644
|
||||
hardware::Return<bool> linked = interface->linkToDeath(this, /*cookie*/ mId);
|
||||
if (!linked.isOk()) {
|
||||
ALOGE("%s: Transaction error in linking to camera provider '%s' death: %s",
|
||||
@@ -1437,7 +1442,7 @@ status_t CameraProviderManager::ProviderInfo::initialize(
|
||||
@@ -1446,7 +1451,7 @@ status_t CameraProviderManager::ProviderInfo::initialize(
|
||||
|
||||
// Get initial list of camera devices, if any
|
||||
std::vector<std::string> devices;
|
||||
@@ -61,7 +61,7 @@ index 4f2b878d26..d11ad8d766 100644
|
||||
Status idStatus,
|
||||
const hardware::hidl_vec<hardware::hidl_string>& cameraDeviceNames) {
|
||||
status = idStatus;
|
||||
@@ -1454,7 +1459,12 @@ status_t CameraProviderManager::ProviderInfo::initialize(
|
||||
@@ -1463,7 +1468,12 @@ status_t CameraProviderManager::ProviderInfo::initialize(
|
||||
mProviderPublicCameraIds.push_back(id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 7ff037ed35bbb81e8834b762248fea580e1f7dea Mon Sep 17 00:00:00 2001
|
||||
From 7e4e53bb24ba8c02be74fb76abbf91d0db47c218 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Tue, 19 May 2020 14:01:14 +0200
|
||||
Subject: [PATCH 06/19] Add a property to force camera timestamp source
|
||||
Subject: [PATCH 06/21] Add a property to force camera timestamp source
|
||||
|
||||
Some devices wrongly report their timesource
|
||||
Camera's timesource can either be CLOCK_MONOTONIC, or CLOCK_BOOTTIME
|
||||
@@ -18,10 +18,10 @@ timestamp source.
|
||||
1 file changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
|
||||
index 87c1c750ed..b4a58ec749 100644
|
||||
index de418da6cc..6c2de0f088 100644
|
||||
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
|
||||
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
|
||||
@@ -346,8 +346,16 @@ status_t Camera3Device::initializeCommonLocked() {
|
||||
@@ -347,8 +347,16 @@ status_t Camera3Device::initializeCommonLocked() {
|
||||
// Measure the clock domain offset between camera and video/hw_composer
|
||||
camera_metadata_entry timestampSource =
|
||||
mDeviceInfo.find(ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 39f279a2575ea4bf23672224c9b7b37dbe199007 Mon Sep 17 00:00:00 2001
|
||||
From f1bcd5087da97f44f857c2fa541bb37b3fdc6d9d Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Tue, 24 Apr 2018 00:14:28 +0200
|
||||
Subject: [PATCH 07/19] FIH devices: Fix "Earpiece" audio output
|
||||
Subject: [PATCH 07/21] FIH devices: Fix "Earpiece" audio output
|
||||
|
||||
On some FIH devices (confirmed on Razer, and probably on Aquos SS2),
|
||||
Earpiece is not listed in attachedDevices, and devicePort's profile
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 47acdf3a578d5d55c98b0f59906c4728248e6687 Mon Sep 17 00:00:00 2001
|
||||
From 70bcea5cf514fbff58e39ca049542c9a73125e1a Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sat, 12 Sep 2020 12:32:50 +0200
|
||||
Subject: [PATCH 08/19] No longer make re-assigning legacy audio groups fatal.
|
||||
Subject: [PATCH 08/21] No longer make re-assigning legacy audio groups fatal.
|
||||
Mi9 declares AUDIO_STREAM_PATCH and AUDIO_STREAM_REROUTING which is defined
|
||||
by framework too
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 1bb61eb2a2777c127b191599d796b5476a26c807 Mon Sep 17 00:00:00 2001
|
||||
From ffe42225949b781674c2a66056b5bab3a707c2be Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Mon, 25 May 2020 21:26:54 +0200
|
||||
Subject: [PATCH 09/19] Add persist.sys.phh.disable_a2dp_offload property to
|
||||
Subject: [PATCH 09/21] Add persist.sys.phh.disable_a2dp_offload property to
|
||||
force a2dp offload
|
||||
|
||||
Change-Id: Id474540c33c594cc4010a1a398d82bff8aadaeea
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From bba858703aee4bcfaaa38ad9f2da7be018fffc17 Mon Sep 17 00:00:00 2001
|
||||
From b61abf82f851557f5b8de4da800f3e9297917602 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Mon, 21 Dec 2020 20:19:11 +0100
|
||||
Subject: [PATCH 10/19] Make camera IDs filter-out optional
|
||||
Subject: [PATCH 10/21] Make camera IDs filter-out optional
|
||||
|
||||
Nowadays most people have Camera 2 apps, and would like to have all
|
||||
cameras, rather than limit which cameras are available.
|
||||
@@ -11,7 +11,7 @@ Add a property for that.
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
|
||||
index d11ad8d766..ab5ddd12d0 100644
|
||||
index 52c78a4695..5158655d33 100644
|
||||
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
|
||||
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
|
||||
@@ -183,7 +183,9 @@ std::vector<std::string> CameraProviderManager::getAPI1CompatibleCameraDeviceIds
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From ed5f24d5cf810c146b60b90a01a85a37ab6c4a28 Mon Sep 17 00:00:00 2001
|
||||
From 031c6f960ea02acf8e43779c8f7e19d2c6ccad15 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sat, 13 Mar 2021 14:20:03 -0500
|
||||
Subject: [PATCH 11/19] Support Samsung R multi-cams
|
||||
Subject: [PATCH 11/21] Support Samsung R multi-cams
|
||||
|
||||
Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555
|
||||
---
|
||||
@@ -22,7 +22,7 @@ index e940c33845..a2a2ad623e 100644
|
||||
],
|
||||
|
||||
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
|
||||
index ab5ddd12d0..c08bcb9ce2 100644
|
||||
index 5158655d33..c873989b08 100644
|
||||
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
|
||||
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
|
||||
@@ -22,6 +22,7 @@
|
||||
@@ -33,7 +33,7 @@ index ab5ddd12d0..c08bcb9ce2 100644
|
||||
|
||||
#include <algorithm>
|
||||
#include <chrono>
|
||||
@@ -1412,7 +1413,9 @@ status_t CameraProviderManager::ProviderInfo::initialize(
|
||||
@@ -1421,7 +1422,9 @@ status_t CameraProviderManager::ProviderInfo::initialize(
|
||||
}
|
||||
|
||||
auto samsungCast = vendor::samsung::hardware::camera::provider::V3_0::ISehCameraProvider::castFrom(interface);
|
||||
@@ -43,7 +43,7 @@ index ab5ddd12d0..c08bcb9ce2 100644
|
||||
|
||||
hardware::Return<bool> linked = interface->linkToDeath(this, /*cookie*/ mId);
|
||||
if (!linked.isOk()) {
|
||||
@@ -1450,6 +1453,7 @@ status_t CameraProviderManager::ProviderInfo::initialize(
|
||||
@@ -1459,6 +1462,7 @@ status_t CameraProviderManager::ProviderInfo::initialize(
|
||||
status = idStatus;
|
||||
if (status == Status::OK) {
|
||||
for (auto& name : cameraDeviceNames) {
|
||||
@@ -51,7 +51,7 @@ index ab5ddd12d0..c08bcb9ce2 100644
|
||||
uint16_t major, minor;
|
||||
std::string type, id;
|
||||
status_t res = parseDeviceName(name, &major, &minor, &type, &id);
|
||||
@@ -1463,7 +1467,9 @@ status_t CameraProviderManager::ProviderInfo::initialize(
|
||||
@@ -1472,7 +1476,9 @@ status_t CameraProviderManager::ProviderInfo::initialize(
|
||||
}
|
||||
} };
|
||||
hardware::Return<void> ret;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 088360f986f6c7c009019eacf10dfc4f1cf5d6a0 Mon Sep 17 00:00:00 2001
|
||||
From c96b60d01a1b131092218cd3810bf2c0cdd71c70 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Tue, 23 Mar 2021 00:16:42 +0100
|
||||
Subject: [PATCH 12/19] Don't crash on unknown audio devices
|
||||
Subject: [PATCH 12/21] Don't crash on unknown audio devices
|
||||
|
||||
Change-Id: I2df8d88f742da6a84aa8888cdf19de25444de919
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 3e64779329fa068fed4fa0f66e2cf498611dc901 Mon Sep 17 00:00:00 2001
|
||||
From 98695ce56229f55bd5c5bc4856f105d6f02d2ebf Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sun, 28 Mar 2021 14:47:52 +0200
|
||||
Subject: [PATCH 13/19] Reenable STRATEGY_ROUTING. This is a leftover of tries
|
||||
Subject: [PATCH 13/21] Reenable STRATEGY_ROUTING. This is a leftover of tries
|
||||
of 587b198, wrongly commited in 20f869
|
||||
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 2b230756e1dc4c184557c577da7aa65f1a890be3 Mon Sep 17 00:00:00 2001
|
||||
From 073d71259db702ec3bc4fa1f46a8c4e41a0ed776 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sun, 28 Mar 2021 14:48:49 +0200
|
||||
Subject: [PATCH 14/19] Use a fake volume policy when none has been found
|
||||
Subject: [PATCH 14/21] Use a fake volume policy when none has been found
|
||||
|
||||
This is useful, because on Samsung devices, the "real"
|
||||
(=non-gsi-cheating) audio policy doesn't have any volume policy.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 504363194ce939aaacf76d0e3f09106d8d68b139 Mon Sep 17 00:00:00 2001
|
||||
From 9a975152664ef309b06f1de15947a0dec2489376 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sun, 28 Mar 2021 18:54:47 +0200
|
||||
Subject: [PATCH 15/19] Not all sources in a route are valid. Dont ignore the
|
||||
Subject: [PATCH 15/21] Not all sources in a route are valid. Dont ignore the
|
||||
whole route because of one broken source
|
||||
|
||||
Change-Id: If8a51740e71bef3a4738262ad7b43a337b0ec36d
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 42780cbfbbb8ad0f5eef80541cb251c54c41129a Mon Sep 17 00:00:00 2001
|
||||
From 7a4aca68a3a50e50518abed26c09253b273736de Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sat, 7 Aug 2021 11:11:39 +0200
|
||||
Subject: [PATCH 16/19] When aux cameras are enabled, ignore "system only"
|
||||
Subject: [PATCH 16/21] When aux cameras are enabled, ignore "system only"
|
||||
camera flag (it shouldnt be q security issue since secure cameras are listed
|
||||
otherwise)
|
||||
|
||||
@@ -10,10 +10,10 @@ Subject: [PATCH 16/19] When aux cameras are enabled, ignore "system only"
|
||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
|
||||
index c08bcb9ce2..5a68fe8cc9 100644
|
||||
index c873989b08..9d26bd44d7 100644
|
||||
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
|
||||
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
|
||||
@@ -579,10 +579,12 @@ SystemCameraKind CameraProviderManager::ProviderInfo::DeviceInfo3::getSystemCame
|
||||
@@ -586,10 +586,12 @@ SystemCameraKind CameraProviderManager::ProviderInfo::DeviceInfo3::getSystemCame
|
||||
|
||||
// Go through the capabilities and check if it has
|
||||
// ANDROID_REQUEST_AVAILABLE_CAPABILITIES_SYSTEM_CAMERA
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 7dd1be6f9d683cdb8a204e3ffde84f08a638d93d Mon Sep 17 00:00:00 2001
|
||||
From 0a0c33fe70c18a9b73925971ba0a67afe07d67da Mon Sep 17 00:00:00 2001
|
||||
From: Peter Cai <peter@typeblog.net>
|
||||
Date: Tue, 19 Oct 2021 21:16:55 -0400
|
||||
Subject: [PATCH 17/19] APM: Restore R and Q behavior respectively for
|
||||
Subject: [PATCH 17/21] APM: Restore R and Q behavior respectively for
|
||||
telephony audio
|
||||
|
||||
This conditionally reverts part of 51c9cc (S) and afd4ce (R) when the
|
||||
@@ -34,7 +34,7 @@ Change-Id: I56d36d2aef4319935cb88a3e4771b23c6d5b2145
|
||||
2 files changed, 28 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
|
||||
index cb9d70055e..dad066ec7f 100644
|
||||
index e334532ebc..5a15e235e0 100644
|
||||
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
|
||||
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
|
||||
@@ -601,6 +601,11 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
|
||||
@@ -90,10 +90,10 @@ index cb9d70055e..dad066ec7f 100644
|
||||
// on other HW module, SinkMetaData of telephony input should handle it
|
||||
// assuming the device uses audio HAL V5.0 and above
|
||||
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h
|
||||
index 98f96d1951..e8b19091d5 100644
|
||||
index 967aa10441..a1e875f559 100644
|
||||
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.h
|
||||
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h
|
||||
@@ -827,6 +827,7 @@ protected:
|
||||
@@ -839,6 +839,7 @@ protected:
|
||||
SoundTriggerSessionCollection mSoundTriggerSessions;
|
||||
|
||||
sp<AudioPatch> mCallTxPatch;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 40839d6f809c90177f3b5160954d2e8abc6cb8f6 Mon Sep 17 00:00:00 2001
|
||||
From 9f79402919068f9aaf1f2c47a82fd3845a35dfa2 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Mon, 11 Oct 2021 16:10:42 -0400
|
||||
Subject: [PATCH 18/19] Revert "Remove support for audio HAL V2 from the
|
||||
Subject: [PATCH 18/21] Revert "Remove support for audio HAL V2 from the
|
||||
framework"
|
||||
|
||||
This reverts commit cbf517f837f7bf8a59f3ff8aa1e0e3e19612e251.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 0ab558df019b2841415ac58d8cf9acc17c217b8a Mon Sep 17 00:00:00 2001
|
||||
From d71c81ad6d3b5ab54212e281c9efeab3cb4711be Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sun, 30 Jan 2022 07:40:19 -0500
|
||||
Subject: [PATCH 19/19] Fix parsing audio hal 7.0 audio policies
|
||||
Subject: [PATCH 19/21] Fix parsing audio hal 7.0 audio policies
|
||||
|
||||
Google changed separator from natural "," to weird " "
|
||||
We broke its support in "FIH devices: Fix "Earpiece" audio output"
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
From f9496b5e570c38233be509c4b14bd0e0f36518ef Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sat, 12 Mar 2022 18:07:43 -0500
|
||||
Subject: [PATCH 20/21] fixup! Not all sources in a route are valid. Dont
|
||||
ignore the whole route because of one broken source
|
||||
|
||||
---
|
||||
.../audiopolicy/common/managerdefinitions/src/Serializer.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
|
||||
index df4f2dff63..2d6aff6146 100644
|
||||
--- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
|
||||
+++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
|
||||
@@ -656,7 +656,7 @@ std::variant<status_t, RouteTraits::Element> PolicySerializer::deserialize<Route
|
||||
if (source == NULL) {
|
||||
source = ctx->findPortByTagName(trim(devTag));
|
||||
}
|
||||
- if (source == NULL) {
|
||||
+ if (source == NULL && false) {
|
||||
ALOGE("%s: no source found with name=%s", __func__, devTag);
|
||||
return BAD_VALUE;
|
||||
} else if (source == NULL) {
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
From 614970eca688faf496cee321f1bed312a0773c8d Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Tue, 5 Apr 2022 15:07:37 -0400
|
||||
Subject: [PATCH 21/21] Next level of force disable a2dp offload: erase all
|
||||
modules related to a2dp, and include our own
|
||||
|
||||
---
|
||||
.../managerdefinitions/src/Serializer.cpp | 24 +++++++++++++++++++
|
||||
1 file changed, 24 insertions(+)
|
||||
|
||||
diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
|
||||
index 2d6aff6146..06c65f1d85 100644
|
||||
--- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
|
||||
+++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
|
||||
@@ -1181,6 +1181,30 @@ status_t PolicySerializer::deserialize(const char *configFile, AudioPolicyConfig
|
||||
if (status != NO_ERROR) {
|
||||
return status;
|
||||
}
|
||||
+
|
||||
+ // Remove modules called bluetooth, bluetooth_qti or a2dp, and inject our own
|
||||
+ if(forceDisableA2dpOffload) {
|
||||
+ for(auto it = modules.begin(); it != modules.end(); it++) {
|
||||
+ const char *name = (*it)->getName();
|
||||
+ if(strcmp(name, "a2dp") == 0 ||
|
||||
+ strcmp(name, "a2dpsink") == 0 ||
|
||||
+ strcmp(name, "bluetooth") == 0 ||
|
||||
+ strcmp(name, "bluetooth_qti") == 0) {
|
||||
+
|
||||
+ ALOGE("Removed module %s\n", name);
|
||||
+ it = modules.erase(it);
|
||||
+ }
|
||||
+ if(it == modules.end()) break;
|
||||
+ }
|
||||
+ const char* a2dpFileName = "/system/etc/a2dp_audio_policy_configuration.xml";
|
||||
+ if (version == "7.0")
|
||||
+ a2dpFileName = "/system/etc/a2dp_audio_policy_configuration_7_0.xml";
|
||||
+ auto doc = make_xmlUnique(xmlParseFile(a2dpFileName));
|
||||
+ xmlNodePtr root = xmlDocGetRootElement(doc.get());
|
||||
+ auto maybeA2dpModule = deserialize<ModuleTraits>(root, config);
|
||||
+ modules.add(std::get<1>(maybeA2dpModule));
|
||||
+ }
|
||||
+
|
||||
config->setHwModules(modules);
|
||||
|
||||
// Global Configuration
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 4a78110a71028d606e6a353aed365f2b7f016510 Mon Sep 17 00:00:00 2001
|
||||
From 5675af56cab31009b7e40c33c0974e3155b7e132 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Tue, 5 Oct 2021 17:59:16 -0400
|
||||
Subject: [PATCH 01/30] Fallback to stupid autobrightness if brightness values
|
||||
Subject: [PATCH 01/31] Fallback to stupid autobrightness if brightness values
|
||||
are broken
|
||||
|
||||
This is needed because of:
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 8f6347bba760a63c0319b6b5a441aff8414e6b58 Mon Sep 17 00:00:00 2001
|
||||
From 052ace3bdbe81360770e85176996525ea7665861 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Tue, 28 Nov 2017 18:28:04 +0100
|
||||
Subject: [PATCH 02/30] Relax requirement for visible flag to sdcards
|
||||
Subject: [PATCH 02/31] Relax requirement for visible flag to sdcards
|
||||
|
||||
The vast majority of sdcard readers are stable enough to be declared by
|
||||
the API. (I see no counter-example)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From ccbe7bd316eeea390d09681dbde75725a7845ed8 Mon Sep 17 00:00:00 2001
|
||||
From 29116da26af1af6c2b8b929b85261e6a23b68807 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Thu, 17 May 2018 20:28:35 +0200
|
||||
Subject: [PATCH 03/30] Don't crash if there is IR HAL is not declared
|
||||
Subject: [PATCH 03/31] Don't crash if there is IR HAL is not declared
|
||||
|
||||
Change-Id: I3afded27441bbee8244d5fda544b3e6d1238dc1b
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 0a01e9129a67b4e155ea43b31b0bd067d18687cb Mon Sep 17 00:00:00 2001
|
||||
From f2300a6714aeffaba7f423f76b93f2dbb06148a7 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Mon, 6 Aug 2018 12:49:00 +0200
|
||||
Subject: [PATCH 04/30] Show APN Settings for CDMA carriers
|
||||
Subject: [PATCH 04/31] Show APN Settings for CDMA carriers
|
||||
|
||||
---
|
||||
telephony/java/android/telephony/CarrierConfigManager.java | 2 +-
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 250548eb42958e47e63fd73ba68c1bc9a95be592 Mon Sep 17 00:00:00 2001
|
||||
From 4c4035881ae7e213433b0fc5c9c8582269302954 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Thu, 8 Nov 2018 23:04:03 +0100
|
||||
Subject: [PATCH 05/30] Re-order services so that it works even without qtaguid
|
||||
Subject: [PATCH 05/31] Re-order services so that it works even without qtaguid
|
||||
|
||||
Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From dd2a85c2aa47d13a454124e97bfff3cd4172b755 Mon Sep 17 00:00:00 2001
|
||||
From 751f7e0840e5f27750a81efe9f94f6c0b484b8e5 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sun, 24 Mar 2019 23:05:14 +0100
|
||||
Subject: [PATCH 06/30] Support samsung Pie and Q light hal
|
||||
Subject: [PATCH 06/31] Support samsung Pie and Q light hal
|
||||
|
||||
Change-Id: I01f94acd7d0672733e48854d80368f9ac6f861c6
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 4d0ab8e90662d7cca5ec7db19e0363b35cf85660 Mon Sep 17 00:00:00 2001
|
||||
From ed9809bbd9fe4936094d680def1efdee23f9b6b3 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Mon, 12 Aug 2019 23:08:26 +0200
|
||||
Subject: [PATCH 07/30] Add support for samsung touch, physical and hover
|
||||
Subject: [PATCH 07/31] Add support for samsung touch, physical and hover
|
||||
proximity sensor as fallback to real proximity sensor
|
||||
|
||||
Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 407aacdb90c06aecadbc7351d92285a77806ae0f Mon Sep 17 00:00:00 2001
|
||||
From b9f801be0142d92b448b2ec91fb4dafb4856791d Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sun, 5 Apr 2020 16:32:46 +0200
|
||||
Subject: [PATCH 08/30] Always allow overriding the number of work profiles
|
||||
Subject: [PATCH 08/31] Always allow overriding the number of work profiles
|
||||
|
||||
Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 034e14c5c940054d1f942b25cc1339b8f6b03545 Mon Sep 17 00:00:00 2001
|
||||
From 8c3d4fcea46de7a0b83df0ae238b09af870bbb1f Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sat, 6 Jun 2020 18:21:56 +0200
|
||||
Subject: [PATCH 09/30] HOME deserves to wake-up devices just as well as back
|
||||
Subject: [PATCH 09/31] HOME deserves to wake-up devices just as well as back
|
||||
and menu
|
||||
|
||||
Change-Id: Ia562bafd8c620d00c17e8eb338e4701c6c4a3c3a
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From e19859819c2b065315c5fb07ea7ffc1bb605d48b Mon Sep 17 00:00:00 2001
|
||||
From 0c03c7a32ba5cadf840e8c599df83486a75c8cca Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Tue, 29 Sep 2020 22:39:47 +0200
|
||||
Subject: [PATCH 10/30] Some devices have proximity sensor reporting NaN as max
|
||||
Subject: [PATCH 10/31] Some devices have proximity sensor reporting NaN as max
|
||||
range for some reason. Make them behave standard way by setting 5 cm
|
||||
|
||||
Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From cfe776121dbdcc0b8678588b2ab4172552e747b5 Mon Sep 17 00:00:00 2001
|
||||
From 356f356b5d061a6977e3a6d64d8b1220311b097d Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Tue, 29 Sep 2020 22:40:10 +0200
|
||||
Subject: [PATCH 11/30] Fix brightness range not being complete on Samsung
|
||||
Subject: [PATCH 11/31] Fix brightness range not being complete on Samsung
|
||||
devices
|
||||
|
||||
On some devices, minimum brightness is 0, which totally messes with
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 1ba5bf7dc38366e06e7b05b4e7411269303b000f Mon Sep 17 00:00:00 2001
|
||||
From 30377055985ef3caec0085e8283200bbe106b3f8 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sun, 25 Oct 2020 23:57:26 +0100
|
||||
Subject: [PATCH 12/30] Re-implement fnmatch-like behaviour for RRO java-side
|
||||
Subject: [PATCH 12/31] Re-implement fnmatch-like behaviour for RRO java-side
|
||||
|
||||
Change-Id: Id38292a9a1453aa87b8401c1fdb390fa4e63c7d1
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 8dc6b1eea2b69d8fd2ad9c39bfa427cfb346c2a2 Mon Sep 17 00:00:00 2001
|
||||
From efa47ee9932c87edea2f8dcb26426303c86d9a16 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sun, 6 Dec 2020 12:20:08 +0100
|
||||
Subject: [PATCH 13/30] Make rounded corners padding overridable with
|
||||
Subject: [PATCH 13/31] Make rounded corners padding overridable with
|
||||
persist.sys.phh.rounded_corners_padding
|
||||
|
||||
Change-Id: I481c1c8849b2f22a7cdfb2896a6d3c2e7e3b44d9
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From ea6bcd921886e585836b991323b7eadb4356835a Mon Sep 17 00:00:00 2001
|
||||
From 247a4b977e1eca76e70017b0865d6658998fa713 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Fri, 11 Dec 2020 14:41:09 +0100
|
||||
Subject: [PATCH 14/30] Remove useless notification about "console" service
|
||||
Subject: [PATCH 14/31] Remove useless notification about "console" service
|
||||
being running
|
||||
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 6c4399d814b9c3112c90a1fe2d585562358260d2 Mon Sep 17 00:00:00 2001
|
||||
From ca9586284beee6dbabab01517f6d0b40147d5174 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Cai <peter@typeblog.net>
|
||||
Date: Wed, 16 Dec 2020 21:24:12 +0800
|
||||
Subject: [PATCH 15/30] Revert "Remove unused SystemProperties.set"
|
||||
Subject: [PATCH 15/31] Revert "Remove unused SystemProperties.set"
|
||||
|
||||
This reverts commit debb4616ef67f9ed5054eca51ec58592358ff55f.
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From f600afdb74b656312e41cd044b754a598cedd088 Mon Sep 17 00:00:00 2001
|
||||
From 947fd7c3edd2e182f107069edc99a109a910d04f Mon Sep 17 00:00:00 2001
|
||||
From: Peter Cai <peter@typeblog.net>
|
||||
Date: Wed, 16 Dec 2020 13:46:15 +0800
|
||||
Subject: [PATCH 16/30] TelephonyManager: bring back getNetworkClass()
|
||||
Subject: [PATCH 16/31] TelephonyManager: bring back getNetworkClass()
|
||||
|
||||
This partially reverts commit c058cac051ab083dc7fb7ea6aa85699110b2e9bf.
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From f23fa294ab33ad231e6d4ee90059016332914b89 Mon Sep 17 00:00:00 2001
|
||||
From 6ca147c2c8bfdaa87355f78f37572b1671994371 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Cai <peter@typeblog.net>
|
||||
Date: Wed, 16 Dec 2020 21:26:45 +0800
|
||||
Subject: [PATCH 17/30] TelephonyManager: add API annotations for
|
||||
Subject: [PATCH 17/31] TelephonyManager: add API annotations for
|
||||
setTelephonyProperty
|
||||
|
||||
* This method was added back by reverting commit
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 27c3433b0ff7c187b283de27f1ab059772e4957c Mon Sep 17 00:00:00 2001
|
||||
From f98dde9d6af10f2990a0433662485eeb385f211d Mon Sep 17 00:00:00 2001
|
||||
From: Alberto Ponces <ponces26@gmail.com>
|
||||
Date: Tue, 2 Feb 2021 10:20:51 +0000
|
||||
Subject: [PATCH 18/30] Fix Wakelock issue
|
||||
Subject: [PATCH 18/31] Fix Wakelock issue
|
||||
|
||||
Prevent SystemUI crash due to "WakeLock under-locked Doze" (issue #12) by only releasing a wakelock that was not already released
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From c7346e5fbc34f2f6c1e175cffe4cfb4b2bb25efa Mon Sep 17 00:00:00 2001
|
||||
From d5649f36686e27f8e94c3ebf1478bfa09d669f8f Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sat, 20 Mar 2021 14:31:01 +0100
|
||||
Subject: [PATCH 19/30] Automatically detect pick up sensor, so that an overlay
|
||||
Subject: [PATCH 19/31] Automatically detect pick up sensor, so that an overlay
|
||||
is required for the sole purpose of enabling pulse doze on pick up sensor
|
||||
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 3cfd962cec75ad34939e5821c96769bdc7006066 Mon Sep 17 00:00:00 2001
|
||||
From e484e2ece36778057bb70c446ca3ac2e5eaac98d Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Tue, 23 Mar 2021 19:43:26 +0100
|
||||
Subject: [PATCH 20/30] Catch broken mainBuiltInDisplayCutoutRectApproximation
|
||||
Subject: [PATCH 20/31] Catch broken mainBuiltInDisplayCutoutRectApproximation
|
||||
|
||||
Some devices (Redmi Note 9T) have:
|
||||
mainBuiltInDisplayCutoutRectApproximation = @android:mainBuiltInDisplayCutout
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 4c27c2503be041833ba539ee4b1a501c4e67c46f Mon Sep 17 00:00:00 2001
|
||||
From d55afdade8ce3c1c5368929af4dd71aad3555174 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sat, 24 Mar 2018 08:01:48 +0100
|
||||
Subject: [PATCH 21/30] backlight: Fix backlight control on Galaxy S9(+)
|
||||
Subject: [PATCH 21/31] backlight: Fix backlight control on Galaxy S9(+)
|
||||
|
||||
Change-Id: I1fbbb47939c377597ef8ad6b88b2acea5f4acaa6
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 308ffd0c8945640cf84ce5b9b50bf066b2dc4e83 Mon Sep 17 00:00:00 2001
|
||||
From e04878670b5c3bfffd2991fa4501b08eb5516636 Mon Sep 17 00:00:00 2001
|
||||
From: Danny Lin <danny@kdrag0n.dev>
|
||||
Date: Sat, 16 Oct 2021 05:27:57 -0700
|
||||
Subject: [PATCH 22/30] Add support for app signature spoofing
|
||||
Subject: [PATCH 22/31] Add support for app signature spoofing
|
||||
|
||||
This is needed by microG GmsCore to pretend to be the official Google
|
||||
Play Services package, because client apps check the package signature
|
||||
@@ -105,10 +105,10 @@ index 166d6abd1809..cba87ff17600 100644
|
||||
<string name="permlab_statusBar">disable or modify status bar</string>
|
||||
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
|
||||
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
|
||||
index e9fcac5fac57..a4a7da126051 100644
|
||||
index 1e001c598987..61a303fcee22 100644
|
||||
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
|
||||
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
|
||||
@@ -3328,6 +3328,29 @@ public class PackageManagerService extends IPackageManager.Stub
|
||||
@@ -3330,6 +3330,29 @@ public class PackageManagerService extends IPackageManager.Stub
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -138,7 +138,7 @@ index e9fcac5fac57..a4a7da126051 100644
|
||||
public final PackageInfo generatePackageInfo(PackageSetting ps, int flags, int userId) {
|
||||
if (!mUserManager.exists(userId)) return null;
|
||||
if (ps == null) {
|
||||
@@ -3356,12 +3379,14 @@ public class PackageManagerService extends IPackageManager.Stub
|
||||
@@ -3358,12 +3381,14 @@ public class PackageManagerService extends IPackageManager.Stub
|
||||
final int[] gids = (flags & PackageManager.GET_GIDS) == 0 ? EMPTY_INT_ARRAY
|
||||
: mPermissionManager.getGidsForUid(UserHandle.getUid(userId, ps.appId));
|
||||
// Compute granted permissions only if package has requested permissions
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From eff8d618d194b5773dee38addc5329448ee3a9ff Mon Sep 17 00:00:00 2001
|
||||
From 94c1a67546b3487b2dea4cdc136d9d019d7192db Mon Sep 17 00:00:00 2001
|
||||
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
|
||||
Date: Sat, 4 Sep 2021 08:26:30 +0000
|
||||
Subject: [PATCH 23/30] Revert "Switch long-press power behavior in AOSP."
|
||||
Subject: [PATCH 23/31] Revert "Switch long-press power behavior in AOSP."
|
||||
|
||||
This reverts commit 803c77a0a24624111944832098c6f65158051dc4.
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From d4214d8e74194049786980aa55126ca22679e839 Mon Sep 17 00:00:00 2001
|
||||
From f029bf72a4fbb195363d841c58d55f9613335328 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Fri, 17 Dec 2021 17:16:14 -0500
|
||||
Subject: [PATCH 24/30] Reduce the size of udfps enroll progress bar. Some
|
||||
Subject: [PATCH 24/31] Reduce the size of udfps enroll progress bar. Some
|
||||
devices have their udfps pretty low, and the progress bar would make the icon
|
||||
at the wrong place
|
||||
|
||||
@@ -11,7 +11,7 @@ Change-Id: I1609ad9ca316293dcaaf07f7e681d11aadfcd29c
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
|
||||
index e520dfed45d0..1bee8eee1534 100644
|
||||
index a41418102c90..6ccabf226772 100644
|
||||
--- a/packages/SystemUI/res/values/config.xml
|
||||
+++ b/packages/SystemUI/res/values/config.xml
|
||||
@@ -592,7 +592,7 @@
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From a3be161414fcefc79314adf4ac5675eba3a75908 Mon Sep 17 00:00:00 2001
|
||||
From 7a65fc6e04b4dc686c67073eb73fe35a1c93ef90 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sun, 19 Dec 2021 17:08:22 -0500
|
||||
Subject: [PATCH 25/30] Add UDFPS support for various devices
|
||||
Subject: [PATCH 25/31] Add UDFPS support for various devices
|
||||
|
||||
Successfully tested on Galaxy A51, Xiaomi Mi 9, and OnePlus Nord 2
|
||||
|
||||
@@ -119,10 +119,10 @@ index 30e5aed2f8d8..7b8a5995f26c 100644
|
||||
|
||||
@Override
|
||||
diff --git a/services/core/Android.bp b/services/core/Android.bp
|
||||
index e432cf0167cc..b63402c290d5 100644
|
||||
index 1893b24c2501..2f5594b4869d 100644
|
||||
--- a/services/core/Android.bp
|
||||
+++ b/services/core/Android.bp
|
||||
@@ -157,6 +157,10 @@ java_library_static {
|
||||
@@ -156,6 +156,10 @@ java_library_static {
|
||||
"android.hardware.soundtrigger-V2.3-java",
|
||||
"android.hardware.power.stats-V1-java",
|
||||
"android.hidl.manager-V1.2-java",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From a3f70fa8332d6b5f7663ec4c41a9491dae511663 Mon Sep 17 00:00:00 2001
|
||||
From 58f189bc4c81f2e45b8434e71674455ed6456553 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Mon, 20 Dec 2021 15:01:41 -0500
|
||||
Subject: [PATCH 26/30] Dynamically resize boot animation to match screen size
|
||||
Subject: [PATCH 26/31] Dynamically resize boot animation to match screen size
|
||||
|
||||
Change-Id: I54e49fc6b8c670103852e212d1416e27ff976205
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From d673b986c46c4eda5fdd2289472bca1fa74b7b72 Mon Sep 17 00:00:00 2001
|
||||
From 7871552e0324ce0fb980d670282c163d88ec3303 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Mon, 27 Dec 2021 17:57:11 -0500
|
||||
Subject: [PATCH 27/30] Once we integrate Samsung Power hal in libpowermanager,
|
||||
Subject: [PATCH 27/31] Once we integrate Samsung Power hal in libpowermanager,
|
||||
libpowermanager and its deps require linking against
|
||||
vendor.samsung.hardware.miscpower@2.0
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From a37fd36e336e956b4e83cff34463e82b1deb7bd7 Mon Sep 17 00:00:00 2001
|
||||
From 250a08142fc0bbe96622346f12dafb003fc10123 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Thu, 3 Mar 2022 09:15:32 -0500
|
||||
Subject: [PATCH 28/30] Add persist.sys.phh.ultrasonic_udfps property to
|
||||
Subject: [PATCH 28/31] Add persist.sys.phh.ultrasonic_udfps property to
|
||||
disable green circle for udfps
|
||||
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From e521ca0d6d7aec9426cab8b4fff44358bd39b1e7 Mon Sep 17 00:00:00 2001
|
||||
From 983dbb48d5f5d20c1bb53dc4b5d4afe735f680c9 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Thu, 3 Mar 2022 09:17:17 -0500
|
||||
Subject: [PATCH 29/30] Allow 128bits SHA1 IPSec keys. This is required to
|
||||
Subject: [PATCH 29/31] Allow 128bits SHA1 IPSec keys. This is required to
|
||||
implement VoLTE with this API
|
||||
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From a25ac1943b563d5ff2f9045a4279a8e73931fd99 Mon Sep 17 00:00:00 2001
|
||||
From eb66d314f14eb35e10d796886fc50f3d6a0cdbc0 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Fri, 4 Mar 2022 19:26:53 -0500
|
||||
Subject: [PATCH 30/30] Fix FOD on ZF8
|
||||
Subject: [PATCH 30/31] Fix FOD on ZF8
|
||||
|
||||
Goodix HAL expects events in this order:
|
||||
- Fingerprint down when touchscreen says fp down
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
From e5999473443fc20611760aaf3098035845e7ec68 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sat, 2 Apr 2022 18:04:01 -0400
|
||||
Subject: [PATCH 31/31] Allow disabling of fingerprint cleanups, needed on some
|
||||
Realme devices that cant enumerate
|
||||
|
||||
---
|
||||
.../biometrics/sensors/fingerprint/hidl/Fingerprint21.java | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
|
||||
index 5f2f4cf6ef3c..29fe37138137 100644
|
||||
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
|
||||
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java
|
||||
@@ -694,6 +694,8 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider
|
||||
|
||||
private void scheduleInternalCleanup(int userId,
|
||||
@Nullable BaseClientMonitor.Callback callback) {
|
||||
+ final boolean mNocleanup = android.os.SystemProperties.getBoolean("persist.sys.phh.fingerprint.nocleanup", false);
|
||||
+ if(mNocleanup) return;
|
||||
mHandler.post(() -> {
|
||||
scheduleUpdateActiveUserWithoutHandler(userId);
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 85ca30782ce91008483456c4946d3611f355ef0f Mon Sep 17 00:00:00 2001
|
||||
From 7ae79ee4272bf8e53e7ac3ebf7feeaa5eaa7e9fd Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Wed, 14 Aug 2019 23:37:10 +0200
|
||||
Subject: [PATCH 01/14] On Samsung, we need to send a hack-message to HAL to
|
||||
Subject: [PATCH 01/16] On Samsung, we need to send a hack-message to HAL to
|
||||
get all Sensors
|
||||
|
||||
Change-Id: Id6a1fa48340de61c418493668e9abd22c2599376
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 59e7d5411b5d16283c6621fb3bdb8c66914c9fc6 Mon Sep 17 00:00:00 2001
|
||||
From 85cf7e3aa2da8ba9693d77ccb08c7f400bd0185f Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Tue, 10 Mar 2020 23:26:55 +0100
|
||||
Subject: [PATCH 02/14] Use BKK's hwcomposer hacks to properly display FOD
|
||||
Subject: [PATCH 02/16] Use BKK's hwcomposer hacks to properly display FOD
|
||||
layers
|
||||
|
||||
Insecure hack: Set FOD layers to magical Z values to trigger
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From b8c0ee8ddc756f376396d5eeb0911fdc715b85e6 Mon Sep 17 00:00:00 2001
|
||||
From e3513a8697bdd009565068be26c73516dbc64feb Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Wed, 20 May 2020 21:16:56 +0200
|
||||
Subject: [PATCH 03/14] Samsung + Xiaomi new FOD HBM controls
|
||||
Subject: [PATCH 03/16] Samsung + Xiaomi new FOD HBM controls
|
||||
|
||||
Change-Id: I5ab27fa70882efa85f0c917bf31bb32adaa09bb1
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 7bf7d976d8a0e49ec6b0244eb8575e54550e8e59 Mon Sep 17 00:00:00 2001
|
||||
From 7d3664e1bab9fb1808a37f4a7be1ca950b206c99 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Thu, 22 Oct 2020 23:22:46 +0200
|
||||
Subject: [PATCH 04/14] Matching an input with a display uses uniqueId
|
||||
Subject: [PATCH 04/16] Matching an input with a display uses uniqueId
|
||||
|
||||
Not all devices have a `location`, notably bluetooth devices.
|
||||
However, we might still want to associate them with a screen,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 0f148f8493b4816ea64c6dad82315a1a54e8ddf9 Mon Sep 17 00:00:00 2001
|
||||
From 1e9df004df4f4e56d2d29a3d252ef16e2b8c95a4 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Tue, 5 Jan 2021 23:44:00 +0100
|
||||
Subject: [PATCH 05/14] unshared_oob didn't exist in O/P, so detect its
|
||||
Subject: [PATCH 05/16] unshared_oob didn't exist in O/P, so detect its
|
||||
supported based on vndk version
|
||||
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 5b3f1feeca0c82282b067993eadd6f280e86572e Mon Sep 17 00:00:00 2001
|
||||
From 0fa6fa2a6b2111e4aecd2dce49ae7f6c3499334c Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Wed, 31 Mar 2021 23:36:03 +0200
|
||||
Subject: [PATCH 06/14] Remove Samsung system permission on sensors
|
||||
Subject: [PATCH 06/16] Remove Samsung system permission on sensors
|
||||
|
||||
---
|
||||
libs/sensor/Sensor.cpp | 1 +
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 0a8ebaa470e9531073a4e7067d10fad6787b8899 Mon Sep 17 00:00:00 2001
|
||||
From 1955781a0d3a49e4ca0121154a2d900bc809e466 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Wed, 20 Oct 2021 09:39:47 -0400
|
||||
Subject: [PATCH 07/14] Try to fallback mCallingSid to getpidcon
|
||||
Subject: [PATCH 07/16] Try to fallback mCallingSid to getpidcon
|
||||
|
||||
This is needed because old vendors (before April 2019 ~) don't support
|
||||
reporting SELinux context of the caller.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From f04dc83be2152a3241784e1fb875d587939a7504 Mon Sep 17 00:00:00 2001
|
||||
From 4e9a863e2dff701c666a8320dbc1ed1669c3f816 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sun, 12 Dec 2021 08:45:36 -0500
|
||||
Subject: [PATCH 08/14] Mark accelerometer input as sensor exclusively if there
|
||||
Subject: [PATCH 08/16] Mark accelerometer input as sensor exclusively if there
|
||||
are ABS axis
|
||||
|
||||
The reason this is needed is that on -fucked up- Xiami Mi A2 Lite and
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 5efdf39b5611b5e0da719069f5f0bbb2c74e1aa5 Mon Sep 17 00:00:00 2001
|
||||
From 9c4d22dda7532f5eab4672c689e697e661ed7516 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Fri, 17 Dec 2021 17:18:20 -0500
|
||||
Subject: [PATCH 09/14] On Samsung devices for FOD HBM, set specific usage bits
|
||||
Subject: [PATCH 09/16] On Samsung devices for FOD HBM, set specific usage bits
|
||||
|
||||
Change-Id: Ibe71e291c6fba9ce48e83a5fd93f1beae3a63bc7
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 0b7b1f06e063f63962592fe35115b2151391758b Mon Sep 17 00:00:00 2001
|
||||
From 007797328f85bd8282cac3bab594202d5f259723 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sun, 19 Dec 2021 16:54:31 -0500
|
||||
Subject: [PATCH 10/14] Update FOD/HBM method Xiaomi/Oplus
|
||||
Subject: [PATCH 10/16] Update FOD/HBM method Xiaomi/Oplus
|
||||
|
||||
Change-Id: If99362db18d8eace487e52716a138e15d1dcfab4
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From b22d8d3469382c919362fb31f6f88e3efd9fdc07 Mon Sep 17 00:00:00 2001
|
||||
From 991127276c25d37ec71204f34b42307255130f02 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Sun, 19 Dec 2021 17:04:51 -0500
|
||||
Subject: [PATCH 11/14] For FOD/HBM on Asus devices, call the HWC extended call
|
||||
Subject: [PATCH 11/16] For FOD/HBM on Asus devices, call the HWC extended call
|
||||
setLayerClass
|
||||
|
||||
Change-Id: Id8773fc3d2fb6d2bd228503b1ee0d77864b2eb05
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 66fc92abe1caf13387ead1abf34e2832550da4ea Mon Sep 17 00:00:00 2001
|
||||
From 73231776adbe33636e7a2b9105f86ea9582a0455 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Mon, 27 Dec 2021 18:00:43 -0500
|
||||
Subject: [PATCH 12/14] powermanager: Add support Samsung miscpower HAL
|
||||
Subject: [PATCH 12/16] powermanager: Add support Samsung miscpower HAL
|
||||
|
||||
Several various configurations need to be supported:
|
||||
- Android Pie vendors have a android.hardware.power HIDL default + "miscpower"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 4c64844d04c1d23b6680b0b4a05ab36005aa3b06 Mon Sep 17 00:00:00 2001
|
||||
From 9e67cd2de2b1e91ad019a71d8ae5b0092b8ee25b Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Wed, 12 Jan 2022 04:07:34 -0500
|
||||
Subject: [PATCH 13/14] Fix loading power hidl v1.0
|
||||
Subject: [PATCH 13/16] Fix loading power hidl v1.0
|
||||
|
||||
Change-Id: Ife20a98d2a11c79c7b42f359f30c28e2dede1f25
|
||||
---
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From a2cab046b8b59be40eb869ed9a3a4b57ea5d3837 Mon Sep 17 00:00:00 2001
|
||||
From a37e367e149becaa633ced984e6fbf6465f1ff1a Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Fri, 4 Mar 2022 19:28:41 -0500
|
||||
Subject: [PATCH 14/14] FOD for Asus ZF8 had layer classes inverted
|
||||
Subject: [PATCH 14/16] FOD for Asus ZF8 had layer classes inverted
|
||||
|
||||
---
|
||||
services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp | 4 ++--
|
||||
|
||||
@@ -0,0 +1,110 @@
|
||||
From 4d446805fba2b6696fa2524daee9585597b853cb Mon Sep 17 00:00:00 2001
|
||||
From: Alec Mouri <alecmouri@google.com>
|
||||
Date: Fri, 12 Nov 2021 12:13:20 -0800
|
||||
Subject: [PATCH 15/16] Don't crash skiagl backend.
|
||||
|
||||
The skiagl backend was incorrectly being created as skiaglthreaded,
|
||||
which breaks mapping ExternalTextures off-thread. Specifically, there is
|
||||
a workaround that disables mapping ExternalTextures at all when the
|
||||
skiagl backend is used. Don't break that workaround by propagating the
|
||||
renderengine type properly to implementations.
|
||||
|
||||
Bug: 205591213
|
||||
Bug: 196334700
|
||||
Bug: 193212592
|
||||
Test: `adb shell stop; adb shell setprop debug.renderengine.backend
|
||||
skiagl; adb shell start` boots
|
||||
|
||||
Change-Id: I455d5d613ccaa210dc748969e025dc86c78080b8
|
||||
Merged-In: I455d5d613ccaa210dc748969e025dc86c78080b8
|
||||
---
|
||||
libs/renderengine/RenderEngine.cpp | 36 ++++++-------------
|
||||
.../include/renderengine/RenderEngine.h | 2 +-
|
||||
2 files changed, 11 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/libs/renderengine/RenderEngine.cpp b/libs/renderengine/RenderEngine.cpp
|
||||
index 0c5a851c41..9e466b6c34 100644
|
||||
--- a/libs/renderengine/RenderEngine.cpp
|
||||
+++ b/libs/renderengine/RenderEngine.cpp
|
||||
@@ -26,55 +26,39 @@
|
||||
namespace android {
|
||||
namespace renderengine {
|
||||
|
||||
-std::unique_ptr<RenderEngine> RenderEngine::create(const RenderEngineCreationArgs& args) {
|
||||
- RenderEngineType renderEngineType = args.renderEngineType;
|
||||
-
|
||||
+std::unique_ptr<RenderEngine> RenderEngine::create(RenderEngineCreationArgs args) {
|
||||
// Keep the ability to override by PROPERTIES:
|
||||
char prop[PROPERTY_VALUE_MAX];
|
||||
property_get(PROPERTY_DEBUG_RENDERENGINE_BACKEND, prop, "");
|
||||
if (strcmp(prop, "gles") == 0) {
|
||||
- renderEngineType = RenderEngineType::GLES;
|
||||
+ args.renderEngineType = RenderEngineType::GLES;
|
||||
}
|
||||
if (strcmp(prop, "threaded") == 0) {
|
||||
- renderEngineType = RenderEngineType::THREADED;
|
||||
+ args.renderEngineType = RenderEngineType::THREADED;
|
||||
}
|
||||
if (strcmp(prop, "skiagl") == 0) {
|
||||
- renderEngineType = RenderEngineType::SKIA_GL;
|
||||
+ args.renderEngineType = RenderEngineType::SKIA_GL;
|
||||
}
|
||||
if (strcmp(prop, "skiaglthreaded") == 0) {
|
||||
- renderEngineType = RenderEngineType::SKIA_GL_THREADED;
|
||||
+ args.renderEngineType = RenderEngineType::SKIA_GL_THREADED;
|
||||
}
|
||||
|
||||
- switch (renderEngineType) {
|
||||
+ switch (args.renderEngineType) {
|
||||
case RenderEngineType::THREADED:
|
||||
ALOGD("Threaded RenderEngine with GLES Backend");
|
||||
return renderengine::threaded::RenderEngineThreaded::create(
|
||||
[args]() { return android::renderengine::gl::GLESRenderEngine::create(args); },
|
||||
- renderEngineType);
|
||||
+ args.renderEngineType);
|
||||
case RenderEngineType::SKIA_GL:
|
||||
ALOGD("RenderEngine with SkiaGL Backend");
|
||||
return renderengine::skia::SkiaGLRenderEngine::create(args);
|
||||
case RenderEngineType::SKIA_GL_THREADED: {
|
||||
- // These need to be recreated, since they are a constant reference, and we need to
|
||||
- // let SkiaRE know that it's running as threaded, and all GL operation will happen on
|
||||
- // the same thread.
|
||||
- RenderEngineCreationArgs skiaArgs =
|
||||
- RenderEngineCreationArgs::Builder()
|
||||
- .setPixelFormat(args.pixelFormat)
|
||||
- .setImageCacheSize(args.imageCacheSize)
|
||||
- .setUseColorManagerment(args.useColorManagement)
|
||||
- .setEnableProtectedContext(args.enableProtectedContext)
|
||||
- .setPrecacheToneMapperShaderOnly(args.precacheToneMapperShaderOnly)
|
||||
- .setSupportsBackgroundBlur(args.supportsBackgroundBlur)
|
||||
- .setContextPriority(args.contextPriority)
|
||||
- .setRenderEngineType(renderEngineType)
|
||||
- .build();
|
||||
ALOGD("Threaded RenderEngine with SkiaGL Backend");
|
||||
return renderengine::threaded::RenderEngineThreaded::create(
|
||||
- [skiaArgs]() {
|
||||
- return android::renderengine::skia::SkiaGLRenderEngine::create(skiaArgs);
|
||||
+ [args]() {
|
||||
+ return android::renderengine::skia::SkiaGLRenderEngine::create(args);
|
||||
},
|
||||
- renderEngineType);
|
||||
+ args.renderEngineType);
|
||||
}
|
||||
case RenderEngineType::GLES:
|
||||
default:
|
||||
diff --git a/libs/renderengine/include/renderengine/RenderEngine.h b/libs/renderengine/include/renderengine/RenderEngine.h
|
||||
index 967cf5deff..f555cdbc0d 100644
|
||||
--- a/libs/renderengine/include/renderengine/RenderEngine.h
|
||||
+++ b/libs/renderengine/include/renderengine/RenderEngine.h
|
||||
@@ -98,7 +98,7 @@ public:
|
||||
SKIA_GL_THREADED = 4,
|
||||
};
|
||||
|
||||
- static std::unique_ptr<RenderEngine> create(const RenderEngineCreationArgs& args);
|
||||
+ static std::unique_ptr<RenderEngine> create(RenderEngineCreationArgs args);
|
||||
|
||||
virtual ~RenderEngine() = 0;
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From 9d066525e16c7a4cdc80bf54f6e912f72f8baaa5 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Hugues Husson <phh@phh.me>
|
||||
Date: Fri, 25 Mar 2022 05:37:56 -0400
|
||||
Subject: [PATCH 16/16] MIUI13 devices hide their vibrator HAL behind
|
||||
non-default name: "vibratorfeature"
|
||||
|
||||
---
|
||||
services/vibratorservice/VibratorHalController.cpp | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/services/vibratorservice/VibratorHalController.cpp b/services/vibratorservice/VibratorHalController.cpp
|
||||
index c1795f5c32..345016efd6 100644
|
||||
--- a/services/vibratorservice/VibratorHalController.cpp
|
||||
+++ b/services/vibratorservice/VibratorHalController.cpp
|
||||
@@ -59,6 +59,12 @@ std::shared_ptr<HalWrapper> connectHal(std::shared_ptr<CallbackScheduler> schedu
|
||||
return std::make_shared<AidlHalWrapper>(std::move(scheduler), aidlHal);
|
||||
}
|
||||
|
||||
+ aidlHal = waitForVintfService<Aidl::IVibrator>(String16("vibratorfeature"));
|
||||
+ if (aidlHal) {
|
||||
+ ALOGV("Successfully connected to Xiaomi Vibrator HAL AIDL service.");
|
||||
+ return std::make_shared<AidlHalWrapper>(std::move(scheduler), aidlHal);
|
||||
+ }
|
||||
+
|
||||
sp<V1_0::IVibrator> halV1_0 = V1_0::IVibrator::getService();
|
||||
if (halV1_0 == nullptr) {
|
||||
ALOGV("Vibrator HAL service not available.");
|
||||
--
|
||||
2.25.1
|
||||
|
||||
Reference in New Issue
Block a user