treble/lineage_patches_unified
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes for March 2023, syncing up to 20230315

Browse Source
This commit is contained in:
Andy CrossGate Yan
2023-03-25 00:22:50 +00:00
parent 4ce6305950
commit 4cd163c62b
138 changed files with 103712 additions and 116618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
patches_treble_td/platform_frameworks_av/0001-APM-Restore-S-R-and-Q-behavior-respectively-for-tele.patch
View File

@@ -1,4 +1,4 @@
From c3bb65b010f19b31a56b8c5d10ef182b32894fbf Mon Sep 17 00:00:00 2001
From 478a67112b5ddfd25c7b36c92ac508d55a54a88a Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 18 Aug 2022 15:44:46 -0400
Subject: [PATCH 01/26] APM: Restore S, R and Q behavior respectively for
@@ -31,12 +31,12 @@ relying on the value of `ro.vndk.version`.
Change-Id: I56d36d2aef4319935cb88a3e4771b23c6d5b2145
---
.../managerdefault/AudioPolicyManager.cpp | 193 +++++++++++++-----
.../managerdefault/AudioPolicyManager.cpp | 197 +++++++++++++-----
.../managerdefault/AudioPolicyManager.h | 3 +
2 files changed, 141 insertions(+), 55 deletions(-)
2 files changed, 143 insertions(+), 57 deletions(-)
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 744609f27b..224dae3820 100644
index 4573382a06..b7d0dbcca4 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -675,6 +675,17 @@ status_t AudioPolicyManager::updateCallRoutingInternal(
@@ -148,10 +148,10 @@ index 744609f27b..224dae3820 100644
bool AudioPolicyManager::isDeviceOfModule(
const sp<DeviceDescriptor>& devDesc, const char *moduleId) const {
sp<HwModule> module = mHwModules.getModuleFromName(moduleId);
@@ -4520,76 +4584,95 @@ status_t AudioPolicyManager::createAudioPatchInternal(const struct audio_patch *
@@ -4541,78 +4605,97 @@ status_t AudioPolicyManager::createAudioPatchInternal(const struct audio_patch *
// in config XML to reach the sink so that is can be declared as available.
audio_io_handle_t output = AUDIO_IO_HANDLE_NONE;
sp<SwAudioOutputDescriptor> outputDesc = nullptr;
sp<SwAudioOutputDescriptor> outputDesc;
- if (!sourceDesc->isInternal()) {
- // take care of dynamic routing for SwOutput selection,
- audio_attributes_t attributes = sourceDesc->attributes();
@@ -180,10 +180,25 @@ index 744609f27b..224dae3820 100644
- ALOGE("%s output is duplicated", __func__);
- return INVALID_OPERATION;
- }
- sourceDesc->setSwOutput(outputDesc);
- bool closeOutput = outputDesc->mDirectOpenCount != 0;
- sourceDesc->setSwOutput(outputDesc, closeOutput);
- } else {
- // Same for "raw patches" aka created from createAudioPatch API
- SortedVector<audio_io_handle_t> outputs =
- getOutputsForDevices(DeviceVector(sinkDevice), mOutputs);
- // if the sink device is reachable via an opened output stream, request to
- // go via this output stream by adding a second source to the patch
- // description
- output = selectOutput(outputs);
- if (output == AUDIO_IO_HANDLE_NONE) {
- ALOGE("%s no output available for internal patch sink", __func__);
- return INVALID_OPERATION;
- }
- outputDesc = mOutputs.valueFor(output);
- if (outputDesc->isDuplicated()) {
- ALOGV("%s output for device %s is duplicated",
- __func__, sinkDevice->toString().c_str());
- return INVALID_OPERATION;
+ if (sourceDesc != nullptr) {
+ if (!sourceDesc->isInternal()) {
+ // take care of dynamic routing for SwOutput selection,
@@ -200,12 +215,12 @@ index 744609f27b..224dae3820 100644
+ output_type_t outputType;
+ bool isSpatialized;
+ getOutputForAttrInt(&resultAttr, &output, AUDIO_SESSION_NONE, &attributes,
+ &stream, sourceDesc->uid(), &config, &flags,
+ &selectedDeviceId, &isRequestedDeviceForExclusiveUse,
+ nullptr, &outputType, &isSpatialized);
+ &stream, sourceDesc->uid(), &config, &flags,
+ &selectedDeviceId, &isRequestedDeviceForExclusiveUse,
+ nullptr, &outputType, &isSpatialized);
+ if (output == AUDIO_IO_HANDLE_NONE) {
+ ALOGV("%s no output for device %s",
+ __FUNCTION__, sinkDevice->toString().c_str());
+ __FUNCTION__, sinkDevice->toString().c_str());
+ return INVALID_OPERATION;
+ }
+ outputDesc = mOutputs.valueFor(output);
@@ -213,24 +228,12 @@ index 744609f27b..224dae3820 100644
+ ALOGE("%s output is duplicated", __func__);
+ return INVALID_OPERATION;
+ }
+ sourceDesc->setSwOutput(outputDesc);
+ bool closeOutput = outputDesc->mDirectOpenCount != 0;
+ sourceDesc->setSwOutput(outputDesc, closeOutput);
+ } else {
+ // Same for "raw patches" aka created from createAudioPatch API
+ SortedVector<audio_io_handle_t> outputs =
getOutputsForDevices(DeviceVector(sinkDevice), mOutputs);
- // if the sink device is reachable via an opened output stream, request to
- // go via this output stream by adding a second source to the patch
- // description
- output = selectOutput(outputs);
- if (output == AUDIO_IO_HANDLE_NONE) {
- ALOGE("%s no output available for internal patch sink", __func__);
- return INVALID_OPERATION;
- }
- outputDesc = mOutputs.valueFor(output);
- if (outputDesc->isDuplicated()) {
- ALOGV("%s output for device %s is duplicated",
- __func__, sinkDevice->toString().c_str());
- return INVALID_OPERATION;
+ getOutputsForDevices(DeviceVector(sinkDevice), mOutputs);
+ // if the sink device is reachable via an opened output stream, request to
+ // go via this output stream by adding a second source to the patch
+ // description
@@ -242,12 +245,12 @@ index 744609f27b..224dae3820 100644
+ outputDesc = mOutputs.valueFor(output);
+ if (outputDesc->isDuplicated()) {
+ ALOGV("%s output for device %s is duplicated",
+ __func__, sinkDevice->toString().c_str());
+ __func__, sinkDevice->toString().c_str());
+ return INVALID_OPERATION;
+ }
+ sourceDesc->setSwOutput(outputDesc);
+ sourceDesc->setSwOutput(outputDesc, /* closeOutput= */ false);
}
- sourceDesc->setSwOutput(outputDesc);
- sourceDesc->setSwOutput(outputDesc, /* closeOutput= */ false);
}
// create a software bridge in PatchPanel if:
// - source and sink devices are on different HW modules OR
@@ -289,16 +292,17 @@ index 744609f27b..224dae3820 100644
audio_port_config srcMixPortConfig = {};
outputDesc->toAudioPortConfig(&srcMixPortConfig, nullptr);
// for volume control, we may need a valid stream
- srcMixPortConfig.ext.mix.usecase.stream = !sourceDesc->isInternal() ?
+ srcMixPortConfig.ext.mix.usecase.stream = (sourceDesc != nullptr && !sourceDesc->isInternal()) ?
srcMixPortConfig.ext.mix.usecase.stream =
- (!sourceDesc->isInternal() || isCallTxAudioSource(sourceDesc)) ?
+ (sourceDesc != nullptr && (!sourceDesc->isInternal() || isCallTxAudioSource(sourceDesc))) ?
mEngine->getStreamTypeForAttributes(sourceDesc->attributes()) :
AUDIO_STREAM_PATCH;
patchBuilder.addSource(srcMixPortConfig);
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h
index db0ee15de8..97fa6f6f81 100644
index a69e08871b..f8762016db 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.h
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h
@@ -938,6 +938,9 @@ protected:
@@ -944,6 +944,9 @@ protected:
SoundTriggerSessionCollection mSoundTriggerSessions;
@@ -309,5 +313,5 @@ index db0ee15de8..97fa6f6f81 100644
SourceClientCollection mAudioSources;
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_av/0002-Fix-BT-in-call-on-CAF-devices.patch
View File

@@ -1,4 +1,4 @@
From 9f20882e39d7af72c514669b7611785fa50ae567 Mon Sep 17 00:00:00 2001
From d1252392714cad0c0f71e8d381925849098122ab 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 02/26] Fix BT in-call on CAF devices
@@ -127,5 +127,5 @@ index d446e9667b..2f0ce75e47 100644
for (const xmlNode *children = cur->xmlChildrenNode; children != NULL;
--
2.25.1
2.34.1

16
patches_treble_td/platform_frameworks_av/0003-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch
View File

@@ -1,4 +1,4 @@
From 76a5783fe2514d7b9d97faa8e221403c02fbcf6a Mon Sep 17 00:00:00 2001
From 209a4b20bd4125df28fcf5ba3d501e84d7454e40 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 03/26] Add (partial, cam id is hardcoded) support for Asus ZF6
@@ -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 80410ab463..b386046c19 100644
index 3f8a0317e1..688c1e7270 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -26,6 +26,7 @@
@@ -30,7 +30,7 @@ index 80410ab463..b386046c19 100644
mEventLog(DEFAULT_EVENT_LOG_LENGTH),
mNumberOfCameras(0),
mNumberOfCamerasWithoutSystemCamera(0),
@@ -1945,6 +1947,7 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String8&
@@ -2039,6 +2041,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 80410ab463..b386046c19 100644
finishConnectLocked(client, partial, oomScoreOffset, systemNativeClient);
}
@@ -2063,6 +2066,27 @@ status_t CameraService::addOfflineClient(String8 cameraId, sp<BasicClient> offli
@@ -2157,6 +2160,27 @@ status_t CameraService::addOfflineClient(String8 cameraId, sp<BasicClient> offli
return OK;
}
@@ -66,7 +66,7 @@ index 80410ab463..b386046c19 100644
Status CameraService::turnOnTorchWithStrengthLevel(const String16& cameraId, int32_t torchStrength,
const sp<IBinder>& clientBinder) {
Mutex::Autolock lock(mServiceLock);
@@ -3318,6 +3342,8 @@ binder::Status CameraService::BasicClient::disconnect() {
@@ -3388,6 +3412,8 @@ binder::Status CameraService::BasicClient::disconnect() {
}
mDisconnected = true;
@@ -76,10 +76,10 @@ index 80410ab463..b386046c19 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 d96ea008bc..5b77139040 100644
index 840e9b6412..b15f988d9e 100644
--- a/services/camera/libcameraservice/CameraService.h
+++ b/services/camera/libcameraservice/CameraService.h
@@ -226,6 +226,9 @@ public:
@@ -227,6 +227,9 @@ public:
// Register an offline client for a given active camera id
status_t addOfflineClient(String8 cameraId, sp<BasicClient> offlineClient);
@@ -90,5 +90,5 @@ index d96ea008bc..5b77139040 100644
// Client functionality
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_av/0004-APM-Optionally-force-load-audio-policy-for-system-si.patch
View File

@@ -1,4 +1,4 @@
From 931ab68c6977b02c8a65ebf63e853b03edcd7145 Mon Sep 17 00:00:00 2001
From 8ae943d95a8c015001341238536f50968dfb8fe3 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 24 Aug 2022 15:42:39 -0400
Subject: [PATCH 04/26] APM: Optionally force-load audio policy for system-side
@@ -57,5 +57,5 @@ index 2f0ce75e47..b35d34a599 100644
// Global Configuration
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_av/0005-APM-Remove-A2DP-audio-ports-from-the-primary-HAL.patch
View File

@@ -1,4 +1,4 @@
From 14ee2d68ff8ebca3b91c6700f292c26f19cd8949 Mon Sep 17 00:00:00 2001
From 0221bd65afca2f16be887b8d33b593d1e3c3db0c Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 25 Aug 2022 13:30:29 -0400
Subject: [PATCH 05/26] APM: Remove A2DP audio ports from the primary HAL
@@ -75,5 +75,5 @@ index b35d34a599..456c5a935c 100644
RouteTraits::Collection routes;
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_av/0006-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch
View File

@@ -1,4 +1,4 @@
From 3955d4df29c79d35948995b150b81326f7ae1b46 Mon Sep 17 00:00:00 2001
From e012a6fdabb37d398c3bd688e3293367d61666be Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Thu, 23 Jan 2020 11:13:43 +0800
Subject: [PATCH 06/26] audiopolicy: try again with trimmed audio port name if
@@ -51,5 +51,5 @@ index 456c5a935c..45ee70ab6e 100644
ALOGE("%s: no source found with name=%s", __func__, devTag);
return BAD_VALUE;
--
2.25.1
2.34.1

12
patches_treble_td/platform_frameworks_av/0007-camera-Implement-property-to-override-default-camera.patch
View File

@@ -1,4 +1,4 @@
From 1deb067cc7b98962ebb0622804ba9b03d9c74d4a Mon Sep 17 00:00:00 2001
From 7d83dd29d502262859a9fc7a8658ef9ef4dd632a Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 1 Jun 2022 16:56:46 -0400
Subject: [PATCH 07/26] camera: Implement property to override default camera
@@ -11,7 +11,7 @@ Change-Id: I002bfa974bafc2cc01365eeea31c7a5dcb5a2028
1 file changed, 22 insertions(+)
diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 6ef16b3ca8..3dd15d9fe9 100644
index 3132787608..5e1ba965b7 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -36,6 +36,7 @@
@@ -22,8 +22,8 @@ index 6ef16b3ca8..3dd15d9fe9 100644
#include <android-base/logging.h>
#include <cutils/properties.h>
#include <hwbinder/IPCThreadState.h>
@@ -205,6 +206,15 @@ std::vector<std::string> CameraProviderManager::getCameraDeviceIds() const {
deviceIds.push_back(id);
@@ -210,6 +211,15 @@ std::vector<std::string> CameraProviderManager::getCameraDeviceIds(std::unordere
}
}
}
+
@@ -38,7 +38,7 @@ index 6ef16b3ca8..3dd15d9fe9 100644
return deviceIds;
}
@@ -271,6 +281,18 @@ std::vector<std::string> CameraProviderManager::getAPI1CompatibleCameraDeviceIds
@@ -276,6 +286,18 @@ std::vector<std::string> CameraProviderManager::getAPI1CompatibleCameraDeviceIds
std::sort(systemDeviceIds.begin(), systemDeviceIds.end(), sortFunc);
deviceIds.insert(deviceIds.end(), publicDeviceIds.begin(), publicDeviceIds.end());
deviceIds.insert(deviceIds.end(), systemDeviceIds.begin(), systemDeviceIds.end());
@@ -58,5 +58,5 @@ index 6ef16b3ca8..3dd15d9fe9 100644
}
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_av/0008-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
View File

@@ -1,4 +1,4 @@
From cdfd6eea207f2cec68e46949895a78075dbbe636 Mon Sep 17 00:00:00 2001
From 55783de99f5000569335532dace13682bde08214 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 08/26] There are three SCO devices. Fallback from one to the
@@ -42,5 +42,5 @@ index 418b7ebe88..a97f76be59 100644
}
--
2.25.1
2.34.1

6
patches_treble_td/platform_frameworks_av/0009-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch
View File

@@ -1,4 +1,4 @@
From 0a037727edf7f2fed2aab9ae61a4d09a8addd226 Mon Sep 17 00:00:00 2001
From baee6d7460ccddc83f5e98a1af03b39784672802 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 09/26] Add persist.sys.phh.samsung.camera_ids property to
@@ -23,7 +23,7 @@ index 981c56942c..7c4e4d9bcd 100644
],
diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
index d60565fb68..b02cf26445 100644
index 1df6ec4449..ac579b4f7d 100644
--- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
+++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
@@ -27,6 +27,7 @@
@@ -76,5 +76,5 @@ index d60565fb68..b02cf26445 100644
ALOGE("%s: Transaction error in getting camera ID list from provider '%s': %s",
__FUNCTION__, mProviderName.c_str(), linked.description().c_str());
--
2.25.1
2.34.1

8
patches_treble_td/platform_frameworks_av/0010-Camera-Avoid-unnecessary-close-of-buffer-acquire-fen.patch
View File

@@ -1,4 +1,4 @@
From ce5c36ff7b82f4ef0add790744795d9f6f2e06e7 Mon Sep 17 00:00:00 2001
From 0a985d6e98b115e5dc938e630e63dfb46b0c33bd Mon Sep 17 00:00:00 2001
From: Emilian Peev <epeev@google.com>
Date: Fri, 5 Aug 2022 17:28:06 -0700
Subject: [PATCH 10/26] Camera: Avoid unnecessary close of buffer acquire fence
@@ -17,7 +17,7 @@ Merged-In: Ieec34b54aaa7f0d773eccb593c3daaa3e41bae0b
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
index 69163a5620..e66624dc6e 100644
index 396104c4fd..c725aadb79 100644
--- a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
@@ -331,7 +331,7 @@ status_t Camera3OutputStream::fixUpHidlJpegBlobHeader(ANativeWindowBuffer* anwBu
@@ -29,7 +29,7 @@ index 69163a5620..e66624dc6e 100644
if (res != OK) {
ALOGE("%s: Failed to lock the buffer: %s (%d)", __FUNCTION__, strerror(-res), res);
return res;
@@ -1308,7 +1308,7 @@ void Camera3OutputStream::dumpImageToDisk(nsecs_t timestamp,
@@ -1327,7 +1327,7 @@ void Camera3OutputStream::dumpImageToDisk(nsecs_t timestamp,
void* mapped = nullptr;
base::unique_fd fenceFd(dup(fence));
status_t res = graphicBuffer->lockAsync(GraphicBuffer::USAGE_SW_READ_OFTEN, &mapped,
@@ -39,5 +39,5 @@ index 69163a5620..e66624dc6e 100644
ALOGE("%s: Failed to lock the buffer: %s (%d)", __FUNCTION__, strerror(-res), res);
return;
--
2.25.1
2.34.1

8
patches_treble_td/platform_frameworks_av/0011-Add-a-property-to-force-camera-timestamp-source.patch
View File

@@ -1,4 +1,4 @@
From 22bcca382ca3b924606970b995d51974c6f05103 Mon Sep 17 00:00:00 2001
From 99e678e0b3f3117c570da358198af887c94ba500 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 11/26] Add a property to force camera timestamp source
@@ -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 7c2f34f46e..6ee3b3e5d8 100644
index 48cc2280ff..830ab0aa9f 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -193,8 +193,16 @@ status_t Camera3Device::initializeCommonLocked() {
@@ -191,8 +191,16 @@ status_t Camera3Device::initializeCommonLocked() {
mTimestampOffset = getMonoToBoottimeOffset();
camera_metadata_entry timestampSource =
mDeviceInfo.find(ANDROID_SENSOR_INFO_TIMESTAMP_SOURCE);
@@ -41,5 +41,5 @@ index 7c2f34f46e..6ee3b3e5d8 100644
}
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_av/0012-FIH-devices-Fix-Earpiece-audio-output.patch
View File

@@ -1,4 +1,4 @@
From 29802ae4be55eeb7a309b7439f0eecf8ecfcdc45 Mon Sep 17 00:00:00 2001
From af90a4845af1cfcdb918c4d7d523f926d4986e24 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 12/26] FIH devices: Fix "Earpiece" audio output
@@ -83,5 +83,5 @@ index 45ee70ab6e..2bf5705512 100644
}
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_av/0013-No-longer-make-re-assigning-legacy-audio-groups-fata.patch
View File

@@ -1,4 +1,4 @@
From 83d18a9021866184f0dacf407f684cf0a6575a6e Mon Sep 17 00:00:00 2001
From 9ca08d8781150a6157c1f8824f2f6b7f36997ecc 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 13/26] No longer make re-assigning legacy audio groups fatal.
@@ -28,5 +28,5 @@ index 99507eee5d..e31cc21b17 100644
}
addSupportedAttributesToGroup(group, volumeGroup, strategy);
--
2.25.1
2.34.1

8
patches_treble_td/platform_frameworks_av/0014-Make-camera-IDs-filter-out-optional.patch
View File

@@ -1,4 +1,4 @@
From a5cddb1ec7a5b8bb8a6b141fe56d9364d222eaa6 Mon Sep 17 00:00:00 2001
From 1401a96f282827700760cd3aaba946fd4365d351 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 14/26] Make camera IDs filter-out optional
@@ -11,10 +11,10 @@ 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 3dd15d9fe9..93af10a0e7 100644
index 5e1ba965b7..2cb27f4ee5 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -255,7 +255,9 @@ std::vector<std::string> CameraProviderManager::getAPI1CompatibleCameraDeviceIds
@@ -260,7 +260,9 @@ std::vector<std::string> CameraProviderManager::getAPI1CompatibleCameraDeviceIds
// API1 app doesn't handle logical and physical camera devices well. So
// for each camera facing, only take the first id advertised by HAL in
// all [logical, physical1, physical2, ...] id combos, and filter out the rest.
@@ -26,5 +26,5 @@ index 3dd15d9fe9..93af10a0e7 100644
}
auto sortFunc =
--
2.25.1
2.34.1

6
patches_treble_td/platform_frameworks_av/0015-Support-Samsung-R-multi-cams.patch
View File

@@ -1,4 +1,4 @@
From 254173b6f4964ff5dcdea58ef5c7e76069702577 Mon Sep 17 00:00:00 2001
From 406d10db45bbf22153de7e4f2dc37d50a9f937e2 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 15/26] Support Samsung R multi-cams
@@ -22,7 +22,7 @@ index 7c4e4d9bcd..1faeb60ba7 100644
],
diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
index b02cf26445..947ddba0ee 100644
index ac579b4f7d..070c9aeeae 100644
--- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
+++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
@@ -28,6 +28,7 @@
@@ -63,5 +63,5 @@ index b02cf26445..947ddba0ee 100644
else
ret = interface->getCameraIdList(cb);
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_av/0016-Don-t-crash-on-unknown-audio-devices.patch
View File

@@ -1,4 +1,4 @@
From 5f4855966f38284865f38bb1ed95a26380771719 Mon Sep 17 00:00:00 2001
From 9ac250245449ad184608256fdc8b16d1b4c61af5 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 16/26] Don't crash on unknown audio devices
@@ -22,5 +22,5 @@ index 2bf5705512..78812b1098 100644
"extension type",
reinterpret_cast<const char*>(attachedDevice.get()));
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_av/0017-Not-all-sources-in-a-route-are-valid.-Dont-ignore-th.patch
View File

@@ -1,4 +1,4 @@
From 5ee043ccc5e7accb3d0d62647dcf0c7b7361122a Mon Sep 17 00:00:00 2001
From 4fa8e746eef418f40f6545b29f8e405a96ad161f 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 17/26] Not all sources in a route are valid. Dont ignore the
@@ -23,5 +23,5 @@ index 78812b1098..9addf7dbdc 100644
return BAD_VALUE;
} else if (source == NULL) {
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_av/0018-Use-a-fake-volume-policy-when-none-has-been-found.patch
View File

@@ -1,4 +1,4 @@
From dbfbd7b96c1d3fe76164b098852fad50f66b5af8 Mon Sep 17 00:00:00 2001
From 3d10c851faca305befccb4b85bc28ccc26018739 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 18/26] Use a fake volume policy when none has been found
@@ -33,5 +33,5 @@ index 6f560d558d..92cf03e418 100644
ALOGE("No readable audio policy config file found");
return BAD_VALUE;
--
2.25.1
2.34.1

8
patches_treble_td/platform_frameworks_av/0019-When-aux-cameras-are-enabled-ignore-system-only-came.patch
View File

@@ -1,4 +1,4 @@
From f8e7a493e3986f0d2d4328018730c036445a7ab9 Mon Sep 17 00:00:00 2001
From 2322d08300341d25fe176b44e355f0bf5b6ae440 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 19/26] When aux cameras are enabled, ignore "system only"
@@ -10,10 +10,10 @@ Subject: [PATCH 19/26] 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 93af10a0e7..aa353f465f 100644
index 2cb27f4ee5..99fc7247b0 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -990,10 +990,12 @@ SystemCameraKind CameraProviderManager::ProviderInfo::DeviceInfo3::getSystemCame
@@ -978,10 +978,12 @@ SystemCameraKind CameraProviderManager::ProviderInfo::DeviceInfo3::getSystemCame
// Go through the capabilities and check if it has
// ANDROID_REQUEST_AVAILABLE_CAPABILITIES_SYSTEM_CAMERA
@@ -31,5 +31,5 @@ index 93af10a0e7..aa353f465f 100644
}
return SystemCameraKind::PUBLIC;
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_av/0020-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch
View File

@@ -1,4 +1,4 @@
From ce0f16b2b6ebbfcc62525e4c318797e545538e7d Mon Sep 17 00:00:00 2001
From 398ab59b91edeb31769d41c064dbc49afa920fd0 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 20/26] Revert "Remove support for audio HAL V2 from the
@@ -77,5 +77,5 @@ index d30883a95c..7bba88ca0a 100644
name: "libaudiohal@4.0",
defaults: ["libaudiohal_default"],
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_av/0021-Fix-parsing-audio-hal-7.0-audio-policies.patch
View File

@@ -1,4 +1,4 @@
From ee6534d8bfbcdd264117a7b532df594187a5e4b2 Mon Sep 17 00:00:00 2001
From 47f94008bf4a0f98f7ef307b45bc38f88823e4ad 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 21/26] Fix parsing audio hal 7.0 audio policies
@@ -25,5 +25,5 @@ index 9addf7dbdc..9d3d9fd169 100644
//Some Foxconn devices have wrong earpiece channel mask, leading to no channel mask
if(channelsMask.size() == 1 && *channelsMask.begin() == AUDIO_CHANNEL_IN_MONO && isOutput) {
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_av/0022-fixup-Not-all-sources-in-a-route-are-valid.-Dont-ign.patch
View File

@@ -1,4 +1,4 @@
From d9bbe176ad0158145237d374783b758548a6fd67 Mon Sep 17 00:00:00 2001
From 81dab535bb14a9b5a5996a558f85c46b1ab9640f 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 22/26] fixup! Not all sources in a route are valid. Dont
@@ -22,5 +22,5 @@ index 9d3d9fd169..95d2463230 100644
return BAD_VALUE;
} else if (source == NULL) {
--
2.25.1
2.34.1

6
patches_treble_td/platform_frameworks_av/0023-Add-a-prop-to-change-Samsung-flash-strength.patch
View File

@@ -1,4 +1,4 @@
From 422b02721cd031ff27143dde4823984a0c02bd2d Mon Sep 17 00:00:00 2001
From 75503abf96c22c30b58e2b0a5677bcee7aac8865 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 16 Apr 2022 14:30:14 -0400
Subject: [PATCH 23/26] Add a prop to change Samsung flash strength
@@ -21,7 +21,7 @@ index 1faeb60ba7..8c588065cf 100644
],
diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
index 947ddba0ee..fd7615a446 100644
index 070c9aeeae..41830f2c82 100644
--- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
+++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
@@ -29,6 +29,7 @@
@@ -53,5 +53,5 @@ index 947ddba0ee..fd7615a446 100644
}
--
2.25.1
2.34.1

6
patches_treble_td/platform_frameworks_av/0024-Support-variable-flash-strength-on-samsung-hal-4.0.patch
View File

@@ -1,4 +1,4 @@
From 9c5799a9da1fa402dd113b104f129217b1eb7f41 Mon Sep 17 00:00:00 2001
From a1d34d9638e76d772793f936278a2980b07db22c Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 2 May 2022 17:37:09 -0400
Subject: [PATCH 24/26] Support variable flash strength on samsung hal 4.0
@@ -21,7 +21,7 @@ index 8c588065cf..769862aaa2 100644
],
diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
index fd7615a446..2fa7dcef7f 100644
index 41830f2c82..a84b58201c 100644
--- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
+++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp
@@ -30,6 +30,7 @@
@@ -48,5 +48,5 @@ index fd7615a446..2fa7dcef7f 100644
s = interface->setTorchMode(enabled ? TorchMode::ON : TorchMode::OFF);
}
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_av/0025-voip-Fix-high-pitched-voice-on-Qualcomm-devices.patch
View File

@@ -1,4 +1,4 @@
From 92661ad5a047752ce253d12bf5bf40fad7771bea Mon Sep 17 00:00:00 2001
From b1832829214487e75c378ecc88aab36ecc0f218e Mon Sep 17 00:00:00 2001
From: ponces <ponces26@gmail.com>
Date: Mon, 24 Oct 2022 09:38:34 +0100
Subject: [PATCH 25/26] voip: Fix high pitched voice on Qualcomm devices
@@ -42,5 +42,5 @@ index 95d2463230..ef310977b2 100644
ALOGE("%s: No %s found", __func__, Attributes::name);
return BAD_VALUE;
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_av/0026-Fix-audio-hal-2.0-support.-Fixup-of-Revert-Remove-su.patch
View File

@@ -1,4 +1,4 @@
From 377da1b5b5df90be27f2571b52f93db0cb8aaeb8 Mon Sep 17 00:00:00 2001
From af448229e29a3f6043bc9af2dafd608349616f5b Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 9 Nov 2022 17:10:52 -0500
Subject: [PATCH 26/26] Fix audio hal 2.0 support. Fixup of Revert "Remove
@@ -89,5 +89,5 @@ index 4069a6bdbd..e9d2af5d2c 100644
ret = factory->openDevice_7_1(
#else
--
2.25.1
2.34.1

8
patches_treble_td/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
View File

@@ -1,4 +1,4 @@
From 2330b72eb800da35252c67dd77743b800afda581 Mon Sep 17 00:00:00 2001
From 8bb17811e9783cb9d05023b907463b4d8178ec79 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/35] Fallback to stupid autobrightness if brightness values
@@ -14,10 +14,10 @@ Change-Id: Ieb679b34239013a5e31b34cb010b12febd9ef6d9
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
index 416518613568..5a56266ad759 100644
index fa812c163643..e8e2fc69e646 100644
--- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java
+++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
@@ -405,9 +405,14 @@ public class DisplayDeviceConfig {
@@ -650,9 +650,14 @@ public class DisplayDeviceConfig {
* @return A configuration instance.
*/
public static DisplayDeviceConfig create(Context context, boolean useConfigXml) {
@@ -35,5 +35,5 @@ index 416518613568..5a56266ad759 100644
config = getConfigFromPmValues(context);
}
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_base/0002-Fix-env-empty-string-ANDROID_STORAGE.patch
View File

@@ -1,4 +1,4 @@
From c884f4408bfa11bb74c4e45be03ad779fc1fc367 Mon Sep 17 00:00:00 2001
From 62fdde809e3ac3bb3dbfa22e64d84ffb6180d7a1 Mon Sep 17 00:00:00 2001
From: Raphael Mounier <mounierr07@gmail.com>
Date: Sat, 6 Aug 2022 18:08:36 +0200
Subject: [PATCH 02/35] Fix env empty string - ANDROID_STORAGE
@@ -22,5 +22,5 @@ index 5177cb4f8549..f593dc38bc1c 100644
@NonNull
--
2.25.1
2.34.1

6
patches_treble_td/platform_frameworks_base/0003-Relax-requirement-for-visible-flag-to-sdcards.patch
View File

@@ -1,4 +1,4 @@
From 1c5e8be3e95808111d4dcd609ecbdc87cafdb21a Mon Sep 17 00:00:00 2001
From 1e432153ed75c31abe94df1250ade6b3db515cfb 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 03/35] Relax requirement for visible flag to sdcards
@@ -13,7 +13,7 @@ Change-Id: Ia616671c03562d1eadaff5531a5c708a62d7ad3a
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 7f3676d0c52b..dc1083879b6e 100644
index c367dcec1b08..3680221b7f52 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -1616,7 +1616,8 @@ class StorageManagerService extends IStorageManager.Stub
@@ -27,5 +27,5 @@ index 7f3676d0c52b..dc1083879b6e 100644
} else if (vol.disk.isSd()) {
vol.mountFlags |= VolumeInfo.MOUNT_FLAG_VISIBLE_FOR_WRITE;
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_base/0004-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
View File

@@ -1,4 +1,4 @@
From d0bc6f39e045548dfa57a5721fd1c804924cf560 Mon Sep 17 00:00:00 2001
From 4628b7d028f66e72d2916cc1a28e05352284bf5b 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 04/35] Don't crash if there is IR HAL is not declared
@@ -42,5 +42,5 @@ index 63daa3503bd5..d068ec06fc14 100644
}
--
2.25.1
2.34.1

12
patches_treble_td/platform_frameworks_base/0005-Implement-a-persistent-property-to-override-the-defa.patch
View File

@@ -1,4 +1,4 @@
From fc7659b79e984f11d276f068792325b79c98be91 Mon Sep 17 00:00:00 2001
From f960e230476cf36078619e632f28c886ba5a723c Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 1 Jun 2022 16:56:20 -0400
Subject: [PATCH 05/35] Implement a persistent property to override the default
@@ -11,10 +11,10 @@ Change-Id: I49b45d00bf71d7932591b3516d49a680e1b6568b
2 files changed, 14 insertions(+)
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 7193b93dba7f..aaa2887d7c5b 100644
index 2fbcf5bfaf52..df9c13edf337 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -452,6 +452,11 @@ public class Camera {
@@ -465,6 +465,11 @@ public class Camera {
* @see #open(int)
*/
public static Camera open() {
@@ -27,10 +27,10 @@ index 7193b93dba7f..aaa2887d7c5b 100644
CameraInfo cameraInfo = new CameraInfo();
for (int i = 0; i < numberOfCameras; i++) {
diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java
index 028b1afd9765..a6c318822d7e 100644
index db19394c16e4..c2f7ecf94580 100644
--- a/core/java/android/hardware/camera2/CameraManager.java
+++ b/core/java/android/hardware/camera2/CameraManager.java
@@ -1754,6 +1754,15 @@ public final class CameraManager {
@@ -1789,6 +1789,15 @@ public final class CameraManager {
}
}});
@@ -47,5 +47,5 @@ index 028b1afd9765..a6c318822d7e 100644
public static boolean cameraStatusesContains(CameraStatus[] cameraStatuses, String id) {
--
2.25.1
2.34.1

8
patches_treble_td/platform_frameworks_base/0006-Show-APN-Settings-for-CDMA-carriers.patch
View File

@@ -1,4 +1,4 @@
From 88e9191c8c4c75d9b2decfe56fede580b0c887bf Mon Sep 17 00:00:00 2001
From 9a744b795bdb1a65fef7736581c3f8149c3f00b7 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 06/35] Show APN Settings for CDMA carriers
@@ -8,10 +8,10 @@ Subject: [PATCH 06/35] Show APN Settings for CDMA carriers
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index cf6d681d596a..4308f6ee40c4 100644
index 741721d14ac1..2b08fa644779 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -8686,7 +8686,7 @@ public class CarrierConfigManager {
@@ -8712,7 +8712,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
sDefaults.putBoolean(KEY_PREFER_2G_BOOL, false);
sDefaults.putBoolean(KEY_4G_ONLY_BOOL, false);
@@ -21,5 +21,5 @@ index cf6d681d596a..4308f6ee40c4 100644
sDefaults.putBoolean(KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL, false);
sDefaults.putBoolean(KEY_SUPPORT_EMERGENCY_SMS_OVER_IMS_BOOL, false);
--
2.25.1
2.34.1

10
patches_treble_td/platform_frameworks_base/0007-Re-order-services-so-that-it-works-even-without-qtag.patch
View File

@@ -1,4 +1,4 @@
From 61b0cf3fa2c541af9789e544c480c2cc1e22fcc9 Mon Sep 17 00:00:00 2001
From 9fcf1455d6bdcb7b4158f7dc7362e7b6a50586bd 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 07/35] Re-order services so that it works even without qtaguid
@@ -9,10 +9,10 @@ Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 8102d892c2d7..ad9a50101e11 100644
index 89dac2160d6b..3e2374f0648c 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -959,6 +959,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
@@ -960,6 +960,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "systemReady");
final int oldPriority = Process.getThreadPriority(Process.myTid());
try {
@@ -23,7 +23,7 @@ index 8102d892c2d7..ad9a50101e11 100644
// Boost thread's priority during system server init
Process.setThreadPriority(Process.THREAD_PRIORITY_FOREGROUND);
if (!isBandwidthControlEnabled()) {
@@ -966,10 +970,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
@@ -967,10 +971,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
return;
}
@@ -35,5 +35,5 @@ index 8102d892c2d7..ad9a50101e11 100644
synchronized (mNetworkPoliciesSecondLock) {
updatePowerSaveWhitelistUL();
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_base/0008-Support-samsung-Pie-and-Q-light-hal.patch
View File

@@ -1,4 +1,4 @@
From d293c5c287d31e0db28cc29d8b2e01d9e22e2e26 Mon Sep 17 00:00:00 2001
From 8bcce90bcd403dd7b8304fb044f6ce9023d8ff52 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 08/35] Support samsung Pie and Q light hal
@@ -22,5 +22,5 @@ index 0d49f5fffb4b..1fc974ebc56f 100644
static_libs: [
--
2.25.1
2.34.1

10
patches_treble_td/platform_frameworks_base/0009-Add-support-for-samsung-touch-physical-and-hover-pro.patch
View File

@@ -1,4 +1,4 @@
From 14efbe6b41852fea066064f71673b57fbadb32a3 Mon Sep 17 00:00:00 2001
From afafdbbdb3d98d61b9234a94142b556ba1add3b8 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 09/35] Add support for samsung touch, physical and hover
@@ -10,10 +10,10 @@ Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865
1 file changed, 35 insertions(+)
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index 9b7cd18760be..d41892634b80 100644
index 8e1d1ae494e4..909d1d533a67 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -2049,6 +2049,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
@@ -2152,6 +2152,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
? Sensor.TYPE_PROXIMITY : SensorUtils.NO_FALLBACK;
mProximitySensor = SensorUtils.findSensor(mSensorManager, proxSensor.type, proxSensor.name,
fallbackType);
@@ -41,7 +41,7 @@ index 9b7cd18760be..d41892634b80 100644
if (mProximitySensor != null) {
mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
TYPICAL_PROXIMITY_THRESHOLD);
@@ -3095,6 +3116,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
@@ -3214,6 +3235,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
public void onSensorChanged(SensorEvent event) {
if (mProximitySensorEnabled) {
final long time = SystemClock.uptimeMillis();
@@ -63,5 +63,5 @@ index 9b7cd18760be..d41892634b80 100644
boolean positive = distance >= 0.0f && distance < mProximityThreshold;
handleProximitySensorEvent(time, positive);
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_base/0010-Always-allow-overriding-the-number-of-work-profiles.patch
View File

@@ -1,4 +1,4 @@
From b04d51fd445cbe8a4004b87b7f95846328897e60 Mon Sep 17 00:00:00 2001
From d596f036963daa2a7d4d6cef0419f5198a6dd385 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 10/35] Always allow overriding the number of work profiles
@@ -28,5 +28,5 @@ index 7090881138c7..2f2b423a9a3b 100644
return defaultMax;
}
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_base/0011-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
View File

@@ -1,4 +1,4 @@
From 4cc199d4054257bbb429d4ab52bb27083bad67b6 Mon Sep 17 00:00:00 2001
From 3fdb0ba3d7ec30aebd578f213b1e104fddcd5edf 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 11/35] HOME deserves to wake-up devices just as well as back
@@ -22,5 +22,5 @@ index 0e818a3fc5ad..d885f55843b1 100644
case KeyEvent.KEYCODE_STEM_1:
case KeyEvent.KEYCODE_STEM_2:
--
2.25.1
2.34.1

8
patches_treble_td/platform_frameworks_base/0012-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch
View File

@@ -1,4 +1,4 @@
From 20a9d35770482af853a9c64e99e1190be6867011 Mon Sep 17 00:00:00 2001
From 3c1464a7850baf06f8776082a8a5f9fb8d2c107f 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 12/35] Some devices have proximity sensor reporting NaN as max
@@ -10,10 +10,10 @@ Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612
1 file changed, 3 insertions(+)
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index d41892634b80..be19e6c4ae53 100644
index 909d1d533a67..5b16e66fa56d 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -2073,6 +2073,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
@@ -2176,6 +2176,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
if (mProximitySensor != null) {
mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
TYPICAL_PROXIMITY_THRESHOLD);
@@ -24,5 +24,5 @@ index d41892634b80..be19e6c4ae53 100644
}
--
2.25.1
2.34.1

8
patches_treble_td/platform_frameworks_base/0013-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
View File

@@ -1,4 +1,4 @@
From 6d4ba0b134dfe1113505224fcf48dc8119a1e952 Mon Sep 17 00:00:00 2001
From a506043b070b18093cc1eaa94a1574f8303996bf 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 13/35] Fix brightness range not being complete on Samsung
@@ -15,10 +15,10 @@ Change-Id: I4d97cbc32490949e83272b81ec6320a5483310b1
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 36ee002709ef..54df08bd95d3 100644
index 0901d2598e32..57e4ac6149d9 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -1135,9 +1135,11 @@ public final class PowerManagerService extends SystemService
@@ -1147,9 +1147,11 @@ public final class PowerManagerService extends SystemService
if (min == INVALID_BRIGHTNESS_IN_CONFIG || max == INVALID_BRIGHTNESS_IN_CONFIG
|| def == INVALID_BRIGHTNESS_IN_CONFIG) {
@@ -33,5 +33,5 @@ index 36ee002709ef..54df08bd95d3 100644
mContext.getResources().getInteger(com.android.internal.R.integer
.config_screenBrightnessSettingMaximum));
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_base/0014-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
View File

@@ -1,4 +1,4 @@
From c8ec111caa612f539f3e1b0983759f83e6861d1f Mon Sep 17 00:00:00 2001
From 49498f83f3be5f12c61f5ce3a462cd94896c5c71 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 14/35] Re-implement fnmatch-like behaviour for RRO java-side
@@ -60,5 +60,5 @@ index 3e1c5bb3d7ec..8182e9e0c771 100644
}
return true;
--
2.25.1
2.34.1

16
patches_treble_td/platform_frameworks_base/0015-Make-rounded-corners-padding-overridable-with-persis.patch
View File

@@ -1,4 +1,4 @@
From 1b2a59d087aa6a2fcb3562b57695c829a1a1b5de Mon Sep 17 00:00:00 2001
From 45bd2fbb05786524850cfe21585273ae4e0b705d 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 15/35] Make rounded corners padding overridable with
@@ -12,7 +12,7 @@ Change-Id: I481c1c8849b2f22a7cdfb2896a6d3c2e7e3b44d9
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
index efa864f12481..04ace4dc2f3a 100644
index 24ab2729384a..b4ff80303d92 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
@@ -23,6 +23,7 @@ import android.content.res.Configuration;
@@ -23,7 +23,7 @@ index efa864f12481..04ace4dc2f3a 100644
import android.os.UserHandle;
import android.provider.AlarmClock;
import android.util.AttributeSet;
@@ -264,8 +265,10 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
@@ -275,8 +276,10 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
mConfigShowBatteryEstimate = resources.getBoolean(R.bool.config_showBatteryEstimateQSBH);
@@ -37,18 +37,18 @@ index efa864f12481..04ace4dc2f3a 100644
int statusBarHeight = SystemBarUtils.getStatusBarHeight(mContext);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
index 5119b8f95aa8..cc8b2d5c0913 100644
index 7b6fc66a208d..6589955c90ff 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
@@ -28,6 +28,7 @@ import android.graphics.Rect;
import android.graphics.drawable.Drawable;
@@ -29,6 +29,7 @@ import android.graphics.drawable.Drawable;
import android.os.Trace;
import android.util.AttributeSet;
import android.util.Pair;
+import android.os.SystemProperties;
import android.util.TypedValue;
import android.view.DisplayCutout;
import android.view.Gravity;
@@ -187,8 +188,10 @@ public class KeyguardStatusBarView extends RelativeLayout {
@@ -195,8 +196,10 @@ public class KeyguardStatusBarView extends RelativeLayout {
R.dimen.ongoing_appops_dot_min_padding);
mCutoutSideNudge = getResources().getDimensionPixelSize(
R.dimen.display_cutout_margin_consumption);
@@ -85,5 +85,5 @@ index c850d4f9c56b..af12f592398b 100644
val minDotPadding = if (isPrivacyDotEnabled)
rotatedResources.getDimensionPixelSize(R.dimen.ongoing_appops_dot_min_padding)
--
2.25.1
2.34.1

8
patches_treble_td/platform_frameworks_base/0016-Remove-useless-notification-about-console-service-be.patch
View File

@@ -1,4 +1,4 @@
From e39dbb92a052a6bccc3d8f118d8c476533917bd0 Mon Sep 17 00:00:00 2001
From 9f85fd8b971d048be3036b7939efd96939403626 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 16/35] Remove useless notification about "console" service
@@ -9,10 +9,10 @@ Subject: [PATCH 16/35] Remove useless notification about "console" service
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 968ff933ed74..652545d047c0 100644
index 5d4dc39341a1..49ceb55a4f4a 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -5172,7 +5172,7 @@ public class ActivityManagerService extends IActivityManager.Stub
@@ -5175,7 +5175,7 @@ public class ActivityManagerService extends IActivityManager.Stub
}
private void showConsoleNotificationIfActive() {
@@ -22,5 +22,5 @@ index 968ff933ed74..652545d047c0 100644
}
String title = mContext
--
2.25.1
2.34.1

6
patches_treble_td/platform_frameworks_base/0017-Revert-Remove-unused-SystemProperties.set.patch
View File

@@ -1,4 +1,4 @@
From 96c21322cf5dd1081f01d619d89cc811ca2ead58 Mon Sep 17 00:00:00 2001
From dda8543c697810aabf14444a1957f6eb3fc49855 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 16 Dec 2020 21:24:12 +0800
Subject: [PATCH 17/35] Revert "Remove unused SystemProperties.set"
@@ -11,7 +11,7 @@ This reverts commit debb4616ef67f9ed5054eca51ec58592358ff55f.
1 file changed, 69 insertions(+)
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index b6f86527b747..1036cc75c71a 100644
index ecd8c7a3d917..64aac1802c6e 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -8028,6 +8028,75 @@ public class TelephonyManager {
@@ -91,5 +91,5 @@ index b6f86527b747..1036cc75c71a 100644
* Inserts or updates a list property. Expands the list if its length is not enough.
*/
--
2.25.1
2.34.1

6
patches_treble_td/platform_frameworks_base/0018-TelephonyManager-bring-back-getNetworkClass.patch
View File

@@ -1,4 +1,4 @@
From d509cc6f47e8f6dbf4d2d1900410620a9b01afbb Mon Sep 17 00:00:00 2001
From da5a82ecf8a1b9f3973cb6c1eeb8da57f17dcde0 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 16 Dec 2020 13:46:15 +0800
Subject: [PATCH 18/35] TelephonyManager: bring back getNetworkClass()
@@ -11,7 +11,7 @@ This partially reverts commit c058cac051ab083dc7fb7ea6aa85699110b2e9bf.
1 file changed, 58 insertions(+)
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 1036cc75c71a..437379e5587c 100644
index 64aac1802c6e..960824e9dd15 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -3164,6 +3164,64 @@ public class TelephonyManager {
@@ -80,5 +80,5 @@ index 1036cc75c71a..437379e5587c 100644
* Returns a string representation of the radio technology (network type)
* currently in use on the device.
--
2.25.1
2.34.1

6
patches_treble_td/platform_frameworks_base/0019-TelephonyManager-add-API-annotations-for-setTelephon.patch
View File

@@ -1,4 +1,4 @@
From 561aafa1108f69107b462061106f6346d540bfba Mon Sep 17 00:00:00 2001
From 71f470a72dd90ab43f69e657fd11d43cdac376c0 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 16 Dec 2020 21:26:45 +0800
Subject: [PATCH 19/35] TelephonyManager: add API annotations for
@@ -14,7 +14,7 @@ Subject: [PATCH 19/35] TelephonyManager: add API annotations for
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 437379e5587c..aacc69757e6a 100644
index 960824e9dd15..f66168b21d2b 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -8092,7 +8092,7 @@ public class TelephonyManager {
@@ -37,5 +37,5 @@ index 437379e5587c..aacc69757e6a 100644
value = "";
}
--
2.25.1
2.34.1

8
patches_treble_td/platform_frameworks_base/0020-Fix-Wakelock-issue.patch
View File

@@ -1,4 +1,4 @@
From 43fbc94d133165e33c6e81f1526951841ff59564 Mon Sep 17 00:00:00 2001
From 7c0498878b8ec06404ea3d84bfbbab6121b86daa Mon Sep 17 00:00:00 2001
From: Alberto Ponces <ponces26@gmail.com>
Date: Tue, 2 Feb 2021 10:20:51 +0000
Subject: [PATCH 20/35] Fix Wakelock issue
@@ -9,10 +9,10 @@ Prevent SystemUI crash due to "WakeLock under-locked Doze" (issue #12) by only r
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java b/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java
index 8d77c4a194a9..e9f253433740 100644
index f320d071b54f..9f98937c2a06 100644
--- a/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java
+++ b/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java
@@ -110,7 +110,9 @@ public interface WakeLock {
@@ -123,7 +123,9 @@ public interface WakeLock {
} else {
mActiveClients.put(why, count - 1);
}
@@ -24,5 +24,5 @@ index 8d77c4a194a9..e9f253433740 100644
/** @see PowerManager.WakeLock#wrap(Runnable) */
--
2.25.1
2.34.1

8
patches_treble_td/platform_frameworks_base/0021-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
View File

@@ -1,4 +1,4 @@
From a588cdbf51f8086b17b860227232ef49659439b2 Mon Sep 17 00:00:00 2001
From 592b55b29ed9a65fb60497f1267d983d04e695e3 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 21/35] Automatically detect pick up sensor, so that an overlay
@@ -9,7 +9,7 @@ Subject: [PATCH 21/35] Automatically detect pick up sensor, so that an overlay
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/core/java/android/hardware/display/AmbientDisplayConfiguration.java b/core/java/android/hardware/display/AmbientDisplayConfiguration.java
index 8c71b363eb7b..ff57d445bbc0 100644
index 47541ca16cda..28168b9208f5 100644
--- a/core/java/android/hardware/display/AmbientDisplayConfiguration.java
+++ b/core/java/android/hardware/display/AmbientDisplayConfiguration.java
@@ -25,6 +25,9 @@ import android.text.TextUtils;
@@ -22,7 +22,7 @@ index 8c71b363eb7b..ff57d445bbc0 100644
import com.android.internal.R;
import com.android.internal.util.ArrayUtils;
@@ -101,8 +104,20 @@ public class AmbientDisplayConfiguration {
@@ -105,8 +108,20 @@ public class AmbientDisplayConfiguration {
/** @hide */
public boolean dozePickupSensorAvailable() {
@@ -46,5 +46,5 @@ index 8c71b363eb7b..ff57d445bbc0 100644
/** @hide */
public boolean tapGestureEnabled(int user) {
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_base/0022-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
View File

@@ -1,4 +1,4 @@
From fa43a8201a8b4f512da418fe95d5d40f5f424f7e Mon Sep 17 00:00:00 2001
From 18501641658cb60092f113b48fa8273f6cfe6322 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 22/35] Catch broken mainBuiltInDisplayCutoutRectApproximation
@@ -47,5 +47,5 @@ index 83a7b3f01a95..78c74ed51910 100644
/**
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_base/0023-backlight-Fix-backlight-control-on-Galaxy-S9.patch
View File

@@ -1,4 +1,4 @@
From a8e8cbc3faa7960d7442089108a4785e7de6a423 Mon Sep 17 00:00:00 2001
From 583cb3343b8223de9ee18982122dc3adcad4ace9 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 23/35] backlight: Fix backlight control on Galaxy S9(+)
@@ -117,5 +117,5 @@ index fea6b29d9260..caf9eba7d9a8 100644
color = 0xff000000 | (color << 16) | (color << 8) | color;
setLightLocked(color, LIGHT_FLASH_NONE, 0, 0, brightnessMode);
--
2.25.1
2.34.1

10
patches_treble_td/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch
View File

@@ -1,4 +1,4 @@
From 2a123e2e0dbd76d9c39c9990de8bc94bcbde0007 Mon Sep 17 00:00:00 2001
From 36ccebb5338549275d96a4369b50a74b8155934f 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 24/35] Revert "Switch long-press power behavior in AOSP."
@@ -9,10 +9,10 @@ This reverts commit 803c77a0a24624111944832098c6f65158051dc4.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 659d0f37bf05..80fa6013ee77 100644
index 987426f56463..a5e687da1155 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1007,7 +1007,7 @@
@@ -1029,7 +1029,7 @@
5 - Go to assistant (Settings.Secure.ASSISTANT)
6 - Toggle torch on / off (if screen is off)
-->
@@ -21,7 +21,7 @@ index 659d0f37bf05..80fa6013ee77 100644
<!-- The time in milliseconds after which a press on power button is considered "long". -->
<integer name="config_longPressOnPowerDurationMs">500</integer>
@@ -1039,7 +1039,7 @@
@@ -1061,7 +1061,7 @@
1 - Mute toggle
2 - Global actions menu
-->
@@ -31,5 +31,5 @@ index 659d0f37bf05..80fa6013ee77 100644
<!-- Control the behavior when the user long presses the back button. Non-zero values are only
valid for watches as part of CDD/CTS.
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_base/0025-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch
View File

@@ -1,4 +1,4 @@
From a081e548874a62da042d24e5da4450de6386bf69 Mon Sep 17 00:00:00 2001
From 84b149c85627215054dc93c97c792eaa37c2051c 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 25/35] Once we integrate Samsung Power hal in libpowermanager,
@@ -23,5 +23,5 @@ index 1fc974ebc56f..c73b29739cbf 100644
static_libs: [
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_base/0026-Allow-disabling-of-fingerprint-cleanups-needed-on-so.patch
View File

@@ -1,4 +1,4 @@
From 2d1281984c28e05e9e646d7c6e225ae36f9b7677 Mon Sep 17 00:00:00 2001
From f497ca6442653b8eef253ad724bb6f90543141a9 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 26/35] Allow disabling of fingerprint cleanups, needed on some
@@ -22,5 +22,5 @@ index c1a86386dfd4..47f130b95267 100644
scheduleUpdateActiveUserWithoutHandler(userId);
--
2.25.1
2.34.1

8
patches_treble_td/platform_frameworks_base/0027-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch
View File

@@ -1,4 +1,4 @@
From 465b5ea6e0e6e229f0a126d947e08be4e308fa47 Mon Sep 17 00:00:00 2001
From 63c5c95736d70ad64c144b731a6fb8b83c8e6ee3 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 27/35] Reduce the size of udfps enroll progress bar. Some
@@ -11,10 +11,10 @@ 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 d7d88cea2dbc..da7a597883eb 100644
index 48c35ae8789d..d3e22e610fc7 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -577,7 +577,7 @@
@@ -580,7 +580,7 @@
<!-- The radius of the enrollment progress bar, in dp -->
<integer name="config_udfpsEnrollProgressBar" translatable="false">
@@ -24,5 +24,5 @@ index d7d88cea2dbc..da7a597883eb 100644
<!-- The time (in ms) needed to trigger the lock icon view's long-press affordance -->
--
2.25.1
2.34.1

12
patches_treble_td/platform_frameworks_base/0028-Dynamically-resize-boot-animation-to-match-screen-si.patch
View File

@@ -1,4 +1,4 @@
From 5cb358f01b28245377a8f00b5ed670eec3817024 Mon Sep 17 00:00:00 2001
From 5ceaeac2773c51308899e7e9aac4bfed4180082c 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 28/35] Dynamically resize boot animation to match screen size
@@ -9,7 +9,7 @@ Change-Id: I54e49fc6b8c670103852e212d1416e27ff976205
1 file changed, 20 insertions(+)
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 9fb8b696b978..ab662611b64d 100644
index 53fe0ba84387..73c2276a032f 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -600,6 +600,26 @@ status_t BootAnimation::readyToRun() {
@@ -36,9 +36,9 @@ index 9fb8b696b978..ab662611b64d 100644
+ }
+ }
+
projectSceneToWindow();
// Register a display event receiver
// Rotate the boot animation according to the value specified in the sysprop
// ro.bootanim.set_orientation_<display_id>. Four values are supported: ORIENTATION_0,
// ORIENTATION_90, ORIENTATION_180 and ORIENTATION_270.
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_base/0029-Revert-Remove-more-FDE-methods-from-StorageManager.patch
View File

@@ -1,4 +1,4 @@
From 4d6edeb45040d2443723ff7933db7ee86d332679 Mon Sep 17 00:00:00 2001
From b307f9724346245c3c7463d3e4bca613db68acfa Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 15 Oct 2022 09:33:56 +0000
Subject: [PATCH 29/35] Revert "Remove more FDE methods from StorageManager"
@@ -123,5 +123,5 @@ index 98d81c9598b8..8b659f927633 100644
public static final boolean CONTROL_PRIVAPP_PERMISSIONS_LOG =
"log".equalsIgnoreCase(CONTROL_PRIVAPP_PERMISSIONS);
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_base/0030-Set-old-fingerprint-sensors-to-security-strong.patch
View File

@@ -1,4 +1,4 @@
From 3d8a59fa4c6cb7230e3fa0391384016602fe88e3 Mon Sep 17 00:00:00 2001
From 4af95a9f96b824f61a0710a8132e007247fa5094 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 3 Dec 2022 17:13:24 -0500
Subject: [PATCH 30/35] Set old fingerprint sensors to security "strong"
@@ -24,5 +24,5 @@ index fffb445895a5..c39f80822b8c 100644
for (int i = 0; i < modalities.size(); ++i) {
final String id = String.valueOf(i);
--
2.25.1
2.34.1

8
patches_treble_td/platform_frameworks_base/0031-Call-Samsung-s-ISehSysInputDev-to-report-screen-stat.patch
View File

@@ -1,4 +1,4 @@
From 81a9631cd24aeb44d261f7f862db7e30b058e690 Mon Sep 17 00:00:00 2001
From 22ad6e21e9330b89e7af8ac4cbd44f6627c688a2 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 14 Dec 2022 17:21:00 -0500
Subject: [PATCH 31/35] Call Samsung's ISehSysInputDev to report screen state
@@ -23,7 +23,7 @@ index f6ba92a94cde..39161ba0df68 100644
javac_shard_size: 50,
}
diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
index 2a219289cf10..29f653f0edd4 100644
index efb2cb7a3283..2807f3e7fbf4 100644
--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
@@ -33,6 +33,7 @@ import android.os.Trace;
@@ -52,7 +52,7 @@ index 2a219289cf10..29f653f0edd4 100644
LocalDisplayDevice(IBinder displayToken, long physicalDisplayId,
SurfaceControl.StaticDisplayInfo staticDisplayInfo,
@@ -815,16 +820,42 @@ final class LocalDisplayAdapter extends DisplayAdapter {
@@ -812,16 +817,42 @@ final class LocalDisplayAdapter extends DisplayAdapter {
}
mSidekickActive = false;
}
@@ -96,5 +96,5 @@ index 2a219289cf10..29f653f0edd4 100644
// have a sidekick available, tell it now that it can take control.
if (Display.isSuspendedState(state) && state != Display.STATE_OFF
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_base/0032-Fixup-of-c50777-original-commit-only-cares-about-R-v.patch
View File

@@ -1,4 +1,4 @@
From 10f0cde830ba4ed97a7a486ee03bd64b4671432e Mon Sep 17 00:00:00 2001
From efbde1bfc3f4566490494e634814cf4b66058e41 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 15 Dec 2022 15:54:50 -0500
Subject: [PATCH 32/35] Fixup of c50777 -- original commit only cares about R
@@ -22,5 +22,5 @@ index c39f80822b8c..7e6f35acc398 100644
// configured in config_biometric_sensors. In the absence of a vendor provided
// configuration, we assume the weakest biometric strength (i.e. convenience).
--
2.25.1
2.34.1

43
patches_treble_td/platform_frameworks_base/0033-FOD-support-for-Asus-ZF8-and-Samsung-devices.patch
View File

@@ -1,4 +1,4 @@
From a56d88a596e6419fd180c9c12a8e5d02633618ea Mon Sep 17 00:00:00 2001
From e4930b4d867d872a0e4c1a28b274dca7e2d84d5e Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 18 Dec 2022 18:20:40 -0500
Subject: [PATCH 33/35] FOD support for Asus ZF8 and Samsung devices
@@ -18,22 +18,22 @@ Change-Id: Ib328f39217c3f9b42e13e186496b3f6391643637
6 files changed, 388 insertions(+), 5 deletions(-)
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index 13372e8c284a..f6bb05fce8a9 100644
index 2438af19317c..60baf02c4aca 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -126,6 +126,7 @@ android_library {
"lottie",
@@ -178,6 +178,7 @@ android_library {
"LowLightDreamLib",
"motion_tool_lib",
"vendor.lineage.powershare-V1.0-java",
+ "vendor.goodix.hardware.biometrics.fingerprint-V2.1-java",
],
manifest: "AndroidManifest.xml",
additional_manifests: ["LineageManifest.xml"],
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index da7a597883eb..d7d6fa34cce8 100644
index d3e22e610fc7..ea4075b75e00 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -577,7 +577,7 @@
@@ -580,7 +580,7 @@
<!-- The radius of the enrollment progress bar, in dp -->
<integer name="config_udfpsEnrollProgressBar" translatable="false">
@@ -43,23 +43,23 @@ index da7a597883eb..d7d6fa34cce8 100644
<!-- The time (in ms) needed to trigger the lock icon view's long-press affordance -->
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
index 1c62f8a4e508..7b2713bf3419 100644
index 8db4927ee059..b14e2ebb56ca 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsControllerOverlay.kt
@@ -102,7 +102,9 @@ class UdfpsControllerOverlay(
@@ -118,7 +118,9 @@ class UdfpsControllerOverlay @JvmOverloads constructor(
gravity = android.view.Gravity.TOP or android.view.Gravity.LEFT
layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
flags = (Utils.FINGERPRINT_OVERLAY_LAYOUT_PARAM_FLAGS or
- WindowManager.LayoutParams.FLAG_SPLIT_TOUCH)
+ WindowManager.LayoutParams.FLAG_SPLIT_TOUCH) or
+ WindowManager.LayoutParams.FLAG_DIM_BEHIND
- WindowManager.LayoutParams.FLAG_SPLIT_TOUCH)
+ WindowManager.LayoutParams.FLAG_SPLIT_TOUCH) or
+ WindowManager.LayoutParams.FLAG_DIM_BEHIND
+ dimAmount = 0.0f
privateFlags = WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY
// Avoid announcing window title.
accessibilityTitle = " "
@@ -153,6 +155,9 @@ class UdfpsControllerOverlay(
@@ -187,6 +189,9 @@ class UdfpsControllerOverlay @JvmOverloads constructor(
windowManager.addView(this, coreLayoutParams.updateDimensions(animation))
sensorRect = sensorBounds
touchExplorationEnabled = accessibilityManager.isTouchExplorationEnabled
+ dimUpdate = {
+ windowManager.updateViewLayout(this, coreLayoutParams.updateDimensions(animation).apply { dimAmount = it })
@@ -68,15 +68,16 @@ index 1c62f8a4e508..7b2713bf3419 100644
if (accessibilityManager.isTouchExplorationEnabled) {
setOnHoverListener { v, event -> onTouch(v, event, true) }
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
index a15456d46897..d591cc809129 100644
index 4a8877edfa53..c8c17b56cd92 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
@@ -19,17 +19,26 @@ import android.content.Context
@@ -19,18 +19,27 @@ import android.content.Context
import android.graphics.Canvas
import android.graphics.Color
import android.graphics.Paint
+import android.graphics.PixelFormat
import android.graphics.PointF
import android.graphics.Rect
import android.graphics.RectF
+import android.os.FileObserver
import android.util.AttributeSet
@@ -98,7 +99,7 @@ index a15456d46897..d591cc809129 100644
/**
* The main view group containing all UDFPS animations.
*/
@@ -37,6 +46,54 @@ class UdfpsView(
@@ -38,6 +47,54 @@ class UdfpsView(
context: Context,
attrs: AttributeSet?
) : FrameLayout(context, attrs), DozeReceiver {
@@ -151,9 +152,9 @@ index a15456d46897..d591cc809129 100644
+
+ }
// sensorRect may be bigger than the sensor. True sensor dimensions are defined in
// overlayParams.sensorBounds
@@ -62,6 +119,8 @@ class UdfpsView(
// Use expanded overlay when feature flag is true, set by UdfpsViewController
var useExpandedOverlay: Boolean = false
@@ -66,6 +123,8 @@ class UdfpsView(
/** Parameters that affect the position and size of the overlay. */
var overlayParams = UdfpsOverlayParams()
@@ -162,7 +163,7 @@ index a15456d46897..d591cc809129 100644
/** Debug message. */
var debugMessage: String? = null
set(value) {
@@ -140,15 +199,94 @@ class UdfpsView(
@@ -150,15 +209,94 @@ class UdfpsView(
!(animationViewController?.shouldPauseAuth() ?: false)
}
@@ -561,5 +562,5 @@ index 7e6f35acc398..063e3599d6cd 100644
+ }
}
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_base/0034-Always-add-HIDL-fingerprint-config-Galaxy-A53-is-mis.patch
View File

@@ -1,4 +1,4 @@
From e7b80f4e36a6bcd7d09e87c3a1dd8e8a66369f15 Mon Sep 17 00:00:00 2001
From 628db9ac97006a1dbb5e216fcc0b374ddd4bb4bd Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 3 Jan 2023 17:59:00 -0500
Subject: [PATCH 34/35] Always add HIDL fingerprint config (Galaxy A53 is
@@ -43,5 +43,5 @@ index 94b67cedf86c..9468f5f91c24 100644
final IBiometricService biometricService = IBiometricService.Stub.asInterface(
ServiceManager.getService(Context.BIOMETRIC_SERVICE));
--
2.25.1
2.34.1

13
patches_treble_td/platform_frameworks_base/0035-SystemUI-Implement-alternate-brightness-path-for-FOD.patch
View File

@@ -1,17 +1,18 @@
From 6f1f5fffb19c27bbbc3ca1498a4c3a001a2839af Mon Sep 17 00:00:00 2001
From 1688bfdd53c2d2967264f4a1fba92a8dbc7e1b8e Mon Sep 17 00:00:00 2001
From: ItsLynix <71310187+ItsLynix@users.noreply.github.com>
Date: Sat, 28 Jan 2023 10:25:16 +0100
Subject: [PATCH 35/35] SystemUI: Implement alternate brightness path for FOD
Change-Id: I0d9d7352c507529a3aa66e7a7d78220887a5a532
---
.../com/android/systemui/biometrics/UdfpsView.kt | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
index d591cc809129..d2e98c181260 100644
index c8c17b56cd92..b3df894fe625 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsView.kt
@@ -222,8 +222,19 @@ Log.d("PHH", "Surface destroyed!")
@@ -232,8 +232,19 @@ Log.d("PHH", "Surface destroyed!")
mySurfaceView.setVisibility(VISIBLE)
Log.d("PHH", "setting surface visible!")
@@ -19,10 +20,10 @@ index d591cc809129..d2e98c181260 100644
- val maxBrightness = File("/sys/class/backlight/panel0-backlight/max_brightness").readText().toDouble()
+ val brightnessFile = File("/sys/class/backlight/panel/brightness")
+ val maxBrightnessFile = File("/sys/class/backlight/panel/max_brightness")
+
+
+ var brightness: Double = 0.0
+ var maxBrightness: Double = 0.0
+
+
+ if (brightnessFile.exists() && maxBrightnessFile.exists()) {
+ brightness = brightnessFile.readText().toDouble()
+ maxBrightness = maxBrightnessFile.readText().toDouble()
@@ -34,5 +35,5 @@ index d591cc809129..d2e98c181260 100644
// Assume HBM is max brightness
val dim = 1.0 - Math.pow( (brightness / maxBrightness), 1/2.3);
--
2.25.1
2.34.1

36
patches_treble_td/platform_frameworks_opt_telephony/0001-SubscriptionController-Do-not-override-default-calli.patch
View File

@@ -1,4 +1,4 @@
From 766497aee0d2e92795721d9b50c0b4f055e97f68 Mon Sep 17 00:00:00 2001
From 124690a23b97f5ae9a37090206813f7b530f5810 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Mon, 5 Sep 2022 14:02:37 -0400
Subject: [PATCH 1/7] SubscriptionController: Do not override default calling
@@ -14,18 +14,23 @@ to keep re-selecting the desired calling account after every reboot.
Test: manual
Change-Id: Iccab64e9b3b3ab4773bd8944d47c2006f229d472
---
.../internal/telephony/SubscriptionController.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
.../telephony/SubscriptionController.java | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/java/com/android/internal/telephony/SubscriptionController.java b/src/java/com/android/internal/telephony/SubscriptionController.java
index ff34cbe2cc..a879a66f34 100644
index 82799bea8b..a9131f6b7a 100644
--- a/src/java/com/android/internal/telephony/SubscriptionController.java
+++ b/src/java/com/android/internal/telephony/SubscriptionController.java
@@ -2858,7 +2858,14 @@ public class SubscriptionController extends ISub.Stub {
PhoneAccountHandle currentHandle = telecomManager.getUserSelectedOutgoingPhoneAccount();
logd("[setDefaultVoiceSubId] current phoneAccountHandle=" + currentHandle);
@@ -2855,9 +2855,22 @@ public class SubscriptionController extends ISub.Stub {
subId);
- if (!Objects.equals(currentHandle, newHandle)) {
TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class);
-
- telecomManager.setUserSelectedOutgoingPhoneAccount(newHandle);
- logd("[setDefaultVoiceSubId] requesting change to phoneAccountHandle=" + newHandle);
+ PhoneAccountHandle currentHandle = telecomManager.getUserSelectedOutgoingPhoneAccount();
+ logd("[setDefaultVoiceSubId] current phoneAccountHandle=" + currentHandle);
+
+ String currentPackageName =
+ currentHandle == null ? null : currentHandle.getComponentName().getPackageName();
+ boolean currentIsSim = "com.android.phone".equals(currentPackageName);
@@ -33,10 +38,15 @@ index ff34cbe2cc..a879a66f34 100644
+ // if the user has selected a third-party app as default
+ boolean shouldKeepOutgoingAccount = currentHandle != null && !currentIsSim;
+
+ if (!Objects.equals(currentHandle, newHandle) && !shouldKeepOutgoingAccount) {
telecomManager.setUserSelectedOutgoingPhoneAccount(newHandle);
logd("[setDefaultVoiceSubId] change to phoneAccountHandle=" + newHandle);
} else {
+ if (!shouldKeepOutgoingAccount) {
+ telecomManager.setUserSelectedOutgoingPhoneAccount(newHandle);
+ logd("[setDefaultVoiceSubId] change to phoneAccountHandle=" + newHandle);
+ } else {
+ logd("[setDefaultVoiceSubId] default phoneAccountHandle not changed.");
+ }
if (previousDefaultSub != getDefaultSubId()) {
sendDefaultChangedBroadcast(getDefaultSubId());
--
2.25.1
2.34.1

6
patches_treble_td/platform_frameworks_opt_telephony/0002-Telephony-Don-not-call-onUssdRelease-for-Huawei-RIL.patch
View File

@@ -1,4 +1,4 @@
From 532d6ca144dfd94347de084e00334d4172127ee7 Mon Sep 17 00:00:00 2001
From 0e3acc4e47d5197132ca6a84c07d690a08536a16 Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 10 Nov 2018 17:19:17 +0000
Subject: [PATCH 2/7] Telephony: Don not call onUssdRelease for Huawei RIL
@@ -13,7 +13,7 @@ Change-Id: I69faed1c51d4582834879975d6ab13daf7f48ad4
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
index ff8412f1a5..6dc1312790 100644
index 76a8d57246..6094483229 100644
--- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
@@ -2834,7 +2834,11 @@ public class GsmCdmaPhone extends Phone {
@@ -30,5 +30,5 @@ index ff8412f1a5..6dc1312790 100644
found.onUssdFinishedError();
} else {
--
2.25.1
2.34.1

6
patches_treble_td/platform_frameworks_opt_telephony/0003-Fix-baseband-being-too-long-to-fit-into-a-91-chars-p.patch
View File

@@ -1,4 +1,4 @@
From 7826023a318e556b7ad4516cf0a942389269d119 Mon Sep 17 00:00:00 2001
From 3f214b88ed09530dda8dd188fd29116d798bddf6 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 6 Dec 2021 16:28:22 -0500
Subject: [PATCH 3/7] Fix baseband being too long to fit into a 91 chars
@@ -10,7 +10,7 @@ Change-Id: I1762e4a8cc137626be89f350229d6be162bdaf57
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
index 6dc1312790..d909085979 100644
index 6094483229..2fefcafebd 100644
--- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
@@ -3128,7 +3128,7 @@ public class GsmCdmaPhone extends Phone {
@@ -23,5 +23,5 @@ index 6dc1312790..d909085979 100644
length <= MAX_VERSION_LEN ? version
: version.substring(length - MAX_VERSION_LEN, length));
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_opt_telephony/0004-Reintroduce-public-void-TelephonyMetrics.writeRilSen.patch
View File

@@ -1,4 +1,4 @@
From d7a177e583b4b1680b09ff87bbe262bff8590cdb Mon Sep 17 00:00:00 2001
From 95a58ef03af0c974050e338f36b25aa4ac535a38 Mon Sep 17 00:00:00 2001
From: ironydelerium <42721860+ironydelerium@users.noreply.github.com>
Date: Fri, 31 Dec 2021 02:20:28 -0800
Subject: [PATCH 4/7] Reintroduce 'public void
@@ -43,5 +43,5 @@ index 3fdbfe0ed7..fb8011c3df 100644
* Write Send SMS event using ImsService. Expecting response from
* {@link #writeOnSmsSolicitedResponse}.
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_opt_telephony/0005-Fix-signalstrength-for-huawei-kirin-hi6250-hi3670.patch
View File

@@ -1,4 +1,4 @@
From fb307d91da795de9de3804f5b5f4f57bbd2e061f Mon Sep 17 00:00:00 2001
From 9fe2a9a86b0087df53a2f566cbda4a29f7d68632 Mon Sep 17 00:00:00 2001
From: Raphael Mounier <mounierr07@gmail.com>
Date: Thu, 6 Oct 2022 08:35:38 +0200
Subject: [PATCH 5/7] Fix signalstrength for huawei kirin (hi6250, hi3670)
@@ -181,5 +181,5 @@ index d947d53611..b74103f594 100644
if (mRil.mSignalStrengthRegistrant != null) {
mRil.mSignalStrengthRegistrant.notifyRegistrant(new AsyncResult (null, ss, null));
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_opt_telephony/0006-telephony-forward-port-support-for-forceCognitive.patch
View File

@@ -1,4 +1,4 @@
From 7ae9986996a870dfd203fcc259dc253a7e6916c8 Mon Sep 17 00:00:00 2001
From 3b1380a76066d12f98999fbb5fb182618642e132 Mon Sep 17 00:00:00 2001
From: corneranchu <corneranchu@gmail.com>
Date: Sat, 1 Oct 2022 01:49:58 +0000
Subject: [PATCH 6/7] telephony: forward-port support for forceCognitive
@@ -51,5 +51,5 @@ index 28f69dcdc9..3e73e2b9ef 100755
if (profileId == DATA_PROFILE_DEFAULT) {
profileId = getApnProfileID(apnContext.getApnType());
--
2.25.1
2.34.1

4
patches_treble_td/platform_frameworks_opt_telephony/0007-Fix-3G-signalstrength-for-huawei-kirin-hi6250-hi3670.patch
View File

@@ -1,4 +1,4 @@
From 3b79555e87859256a2891be83cfb5051701bf6a1 Mon Sep 17 00:00:00 2001
From 61a2d669017f21f53b9174b38c24e3d9c18882ec Mon Sep 17 00:00:00 2001
From: Raphael Mounier <mounierr07@gmail.com>
Date: Tue, 22 Nov 2022 06:54:35 +0100
Subject: [PATCH 7/7] Fix 3G signalstrength for huawei kirin (hi6250, hi3670)
@@ -232,5 +232,5 @@ index ffb9b4a71c..182b335656 100644
/**
--
2.25.1
2.34.1

4
patches_treble_td/platform_packages_modules_Bluetooth/0001-audio_hal_interface-Optionally-use-sysbta-HAL.patch
View File

@@ -1,4 +1,4 @@
From 167d1cb02b7f5a350d630bcc85ef0e2953d0db89 Mon Sep 17 00:00:00 2001
From 74332fd5cf8c33e6cd32d61c5abc5675524f9f28 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Wed, 24 Aug 2022 15:45:18 -0400
Subject: [PATCH 1/4] audio_hal_interface: Optionally use sysbta HAL
@@ -103,5 +103,5 @@ index a2c192f37d..c3d1cf35c2 100644
return;
}
--
2.25.1
2.34.1

4
patches_treble_td/platform_packages_modules_Bluetooth/0002-Add-option-to-change-eSCO-Transport-Unit-Size.patch
View File

@@ -1,4 +1,4 @@
From cc0c1e63f020b11244bea29508619c3f382d5f69 Mon Sep 17 00:00:00 2001
From 696440946140355e4282f41c470f9ad181089403 Mon Sep 17 00:00:00 2001
From: Alberto Ponces <ponces26@gmail.com>
Date: Thu, 17 Jun 2021 15:48:53 +0100
Subject: [PATCH 2/4] Add option to change eSCO Transport Unit Size
@@ -40,5 +40,5 @@ index 143e230a39..431aaacf17 100644
return default_esco_parameters[codec];
}
--
2.25.1
2.34.1

4
patches_treble_td/platform_packages_modules_Bluetooth/0003-Don-t-abort-when-failing-to-get-real-time-priority.patch
View File

@@ -1,4 +1,4 @@
From 4caae29b750758de788974e6d2e315123624af1c Mon Sep 17 00:00:00 2001
From 5a0f4b6007c2c7573618fde34b8b6d878b4054d8 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 17 Oct 2021 17:17:13 -0400
Subject: [PATCH 3/4] Don't abort when failing to get real-time priority
@@ -81,5 +81,5 @@ index 5f3260763f..2f937cd3ee 100644
LOG(ERROR) << __func__ << ": unable to enable real time scheduling";
#endif
--
2.25.1
2.34.1

22
patches_treble_td/platform_packages_modules_Bluetooth/0004-On-Samsung-devices-we-need-to-tell-Audio-HAL-if-we-r.patch
View File

@@ -1,4 +1,4 @@
From 304b0cb0b164950c63ecd4e1e4f80d4d0a3f7a3d Mon Sep 17 00:00:00 2001
From 4291a5b6999072d722d7ebc8968012d2c4a075da Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Sat, 12 Nov 2022 00:35:46 +0000
Subject: [PATCH 4/4] On Samsung devices, we need to tell Audio HAL if we're
@@ -12,18 +12,18 @@ Change-Id: I7802b7a29c017a2cd7018e82772183df1dfa0b89
1 file changed, 8 insertions(+)
diff --git a/android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java b/android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
index e431c43bde..82aa7c89e3 100644
index b237e7d6cc..73579cba50 100644
--- a/android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
+++ b/android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
@@ -145,6 +145,7 @@ public class HeadsetStateMachine extends StateMachine {
@@ -147,6 +147,7 @@ public class HeadsetStateMachine extends StateMachine {
// Audio Parameters
private boolean mHasNrecEnabled = false;
private boolean mHasWbsEnabled = false;
+ private int mReportScoSampleRate = 0;
// AT Phone book keeps a group of states used by AT+CPBR commands
private final AtPhonebook mPhonebook;
// HSP specific
@@ -225,6 +226,7 @@ public class HeadsetStateMachine extends StateMachine {
@VisibleForTesting
final AtPhonebook mPhonebook;
@@ -228,6 +229,7 @@ public class HeadsetStateMachine extends StateMachine {
}
mHasWbsEnabled = false;
mHasNrecEnabled = false;
@@ -31,7 +31,7 @@ index e431c43bde..82aa7c89e3 100644
}
public void dump(StringBuilder sb) {
@@ -454,6 +456,7 @@ public class HeadsetStateMachine extends StateMachine {
@@ -457,6 +459,7 @@ public class HeadsetStateMachine extends StateMachine {
mNeedDialingOutReply = false;
mHasWbsEnabled = false;
mHasNrecEnabled = false;
@@ -39,7 +39,7 @@ index e431c43bde..82aa7c89e3 100644
broadcastStateTransitions();
// Remove the state machine for unbonded devices
if (mPrevState != null
@@ -1538,6 +1541,9 @@ public class HeadsetStateMachine extends StateMachine {
@@ -1542,6 +1545,9 @@ public class HeadsetStateMachine extends StateMachine {
+ " hasNrecEnabled=" + mHasNrecEnabled
+ " hasWbsEnabled=" + mHasWbsEnabled);
am.setBluetoothHeadsetProperties(getCurrentDeviceName(), mHasNrecEnabled, mHasWbsEnabled);
@@ -48,8 +48,8 @@ index e431c43bde..82aa7c89e3 100644
+ }
}
private String parseUnknownAt(String atString) {
@@ -1678,10 +1684,12 @@ public class HeadsetStateMachine extends StateMachine {
@VisibleForTesting
@@ -1685,10 +1691,12 @@ public class HeadsetStateMachine extends StateMachine {
switch (wbsConfig) {
case HeadsetHalConstants.BTHF_WBS_YES:
mHasWbsEnabled = true;
@@ -63,5 +63,5 @@ index e431c43bde..82aa7c89e3 100644
default:
Log.e(TAG, "processWBSEvent: unknown wbsConfig " + wbsConfig);
--
2.25.1
2.34.1