nehemiah-zb/lineage_patches_unified
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes for December 2021

Browse Source
This commit is contained in:
Andy CrossGate Yan
2021-12-06 16:19:39 +00:00
parent 211d0a69c8
commit 463b837c1b
102 changed files with 791 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches_treble_phh/platform_frameworks_av/0001-Fix-BT-in-call-on-CAF-devices.patch
View File

@@ -1,7 +1,7 @@
From e280efe7945437b9295600f3ade73deb978284eb Mon Sep 17 00:00:00 2001
From 4c452bb5ff1f23279efa5200c1c9b04d563bed8f 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/18] Fix BT in-call on CAF devices
See https://github.com/phhusson/treble_experimentations/issues/374
@@ -127,5 +127,5 @@ index 84ed6567b2..9a857ff091 100644
for (const xmlNode *children = cur->xmlChildrenNode; children != NULL;
--
2.29.2
2.25.1

6
patches_treble_phh/platform_frameworks_av/0002-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch
View File

@@ -1,7 +1,7 @@
From f12a643ff63c4d54bb5d50a0a9d62d518b5db470 Mon Sep 17 00:00:00 2001
From 8ee7ce7f56c8f45288e9a0135a8ee20f18d79b57 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/18] Add (partial, cam id is hardcoded) support for Asus ZF6
motor camera
Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe
@@ -90,5 +90,5 @@ index bc2e3479bc..b58c41e115 100644
// Client functionality
--
2.29.2
2.25.1

6
patches_treble_phh/platform_frameworks_av/0003-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch
View File

@@ -1,7 +1,7 @@
From ee73ef44e02af6f673e83a8810fe9ea88dc2c821 Mon Sep 17 00:00:00 2001
From 307bf28e8863d55291bb52cf5724fa0f541adfcd 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/18] audiopolicy: try again with trimmed audio port name if
not found
* In Spreadtrum BSP, some audio routes may contain ports with extra
@@ -51,5 +51,5 @@ index 9a857ff091..d919951007 100644
ALOGE("%s: no source found with name=%s", __func__, devTag);
return BAD_VALUE;
--
2.29.2
2.25.1

6
patches_treble_phh/platform_frameworks_av/0004-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
View File

@@ -1,7 +1,7 @@
From 8c442bfb93e93c8ea4e7a6de03ea7b5e42369f11 Mon Sep 17 00:00:00 2001
From be6b7ba5a52fda8a3dba06e4b58cf7f91b1f166e 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/18] There are three SCO devices. Fallback from one to the
others if needed
Change-Id: I414dcb6b154855c00cb8520b23dc1069827864b2
@@ -42,5 +42,5 @@ index 3a143b0058..565defc203 100644
}
--
2.29.2
2.25.1

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

@@ -1,7 +1,7 @@
From 7541559278b514f14a4f2f8a5f775996ee1e5e68 Mon Sep 17 00:00:00 2001
From 9e9c10692262d752934e2343dfe76b0582c23601 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/18] Add persist.sys.phh.samsung.camera_ids property to
access hidden Samsung cameras
Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593
@@ -76,5 +76,5 @@ index 4f2b878d26..d11ad8d766 100644
ALOGE("%s: Transaction error in getting camera ID list from provider '%s': %s",
__FUNCTION__, mProviderName.c_str(), linked.description().c_str());
--
2.29.2
2.25.1

6
patches_treble_phh/platform_frameworks_av/0006-Add-a-property-to-force-camera-timestamp-source.patch
View File

@@ -1,7 +1,7 @@
From 274f3141e9dc93dde02a81a1889cd76b14860251 Mon Sep 17 00:00:00 2001
From 13f93488d8f5f2ebf9e350cd9f0f0cc0f7e8313d 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/18] 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
@@ -41,5 +41,5 @@ index fd645c7a72..4a6a922c43 100644
}
--
2.29.2
2.25.1

6
patches_treble_phh/platform_frameworks_av/0007-FIH-devices-Fix-Earpiece-audio-output.patch
View File

@@ -1,7 +1,7 @@
From 6d40f84ff32e4c1f50f794890790d6159132ba4e Mon Sep 17 00:00:00 2001
From ccc5945c9b22dd3e96cf8ed602d8fc1697dedb87 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/18] 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
@@ -83,5 +83,5 @@ index d919951007..abc54ccc24 100644
}
--
2.29.2
2.25.1

10
patches_treble_phh/platform_frameworks_av/0008-audiopolicy-No-longer-make-re-assigning-legacy-audio.patch → patches_treble_phh/platform_frameworks_av/0008-No-longer-make-re-assigning-legacy-audio-groups-fata.patch
View File

@@ -1,9 +1,9 @@
From ed83392795ee1511619cb8d81160e6feecdcb7f9 Mon Sep 17 00:00:00 2001
From 4babf9d2e8c5169cabe185b99bce89e0ccfa1b9b 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] [audiopolicy] No longer make re-assigning legacy audio
groups fatal. Mi9 declares AUDIO_STREAM_PATCH and AUDIO_STREAM_REROUTING
which is defined by framework too
Subject: [PATCH 08/18] No longer make re-assigning legacy audio groups fatal.
Mi9 declares AUDIO_STREAM_PATCH and AUDIO_STREAM_REROUTING which is defined
by framework too
Change-Id: I794fe22d63a8af705be4f5f09b9879ecaab3eae5
---
@@ -28,5 +28,5 @@ index 150a9a8e4f..740eab288c 100644
}
addSupportedAttributesToGroup(group, volumeGroup, strategy);
--
2.29.2
2.25.1

8
patches_treble_phh/platform_frameworks_av/0009-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch
View File

@@ -1,7 +1,7 @@
From 55f69fe9965419355d26e7b5a2bb9975eef0f23c Mon Sep 17 00:00:00 2001
From cfc4fa6db350285e5a6ab87735e9252a1c070509 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/18] Add persist.sys.phh.disable_a2dp_offload property to
force a2dp offload
Change-Id: Id474540c33c594cc4010a1a398d82bff8aadaeea
@@ -12,7 +12,7 @@ Change-Id: Id474540c33c594cc4010a1a398d82bff8aadaeea
3 files changed, 197 insertions(+), 7 deletions(-)
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 1aa18485f9..f9365cacc9 100644
index 1e64538d89..2923575327 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -1183,6 +1183,9 @@ status_t ACodec::configureOutputBuffersFromNativeWindow(
@@ -322,5 +322,5 @@ index c73c17d1e4..314de7889b 100644
{ "STRATEGY_CALL_ASSISTANT", STRATEGY_CALL_ASSISTANT },
};
--
2.29.2
2.25.1

6
patches_treble_phh/platform_frameworks_av/0010-Make-camera-IDs-filter-out-optional.patch
View File

@@ -1,7 +1,7 @@
From c461aa6104426d270e1297a1e2d6213fb4c34297 Mon Sep 17 00:00:00 2001
From 5f2eb5d0a7224f6f466de35c9eeed3ae5a4dbf5e 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/18] 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.
@@ -26,5 +26,5 @@ index d11ad8d766..ab5ddd12d0 100644
}
auto sortFunc =
--
2.29.2
2.25.1

37
patches_treble_phh/platform_frameworks_av/0011-Fix-AAC-decoder-failing-to-instantiate.patch
View File

@@ -1,37 +0,0 @@
From 91e653004e622132574610017e855056358d8f6c Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 6 Mar 2021 19:15:24 -0500
Subject: [PATCH 11/19] Fix AAC decoder failing to instantiate
This has been caused by I50fcc5ef35cb7e96592c2267652228b5fa074ba9
Non-Android 11 vendors won't provide those calls, and will thus fail.
---
media/libstagefright/ACodec.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index f9365cacc9..52ca1955e8 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -5405,9 +5405,7 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) {
err = mOMXNode->getParameter(
(OMX_INDEXTYPE)OMX_IndexParamAudioAndroidAacDrcPresentation,
&presentation, sizeof(presentation));
- if (err != OK) {
- return err;
- }
+ if (err == OK) {
notify->setInt32("aac-encoded-target-level",
presentation.nEncodedTargetLevel);
notify->setInt32("aac-drc-cut-level", presentation.nDrcCut);
@@ -5420,6 +5418,7 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) {
notify->setInt32("aac-drc-album-mode", presentation.nDrcAlbumMode);
notify->setInt32("aac-drc-output-loudness",
presentation.nDrcOutputLoudness);
+ }
}
}
break;
--
2.29.2

6
patches_treble_phh/platform_frameworks_av/0012-Support-Samsung-R-multi-cams.patch → patches_treble_phh/platform_frameworks_av/0011-Support-Samsung-R-multi-cams.patch
View File

@@ -1,7 +1,7 @@
From 80e55073914af5719060ef1c6b1f3bddfb6b7b5f Mon Sep 17 00:00:00 2001
From 2f93928141323d08cba2f10517c4338d3af0ef59 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 12/19] Support Samsung R multi-cams
Subject: [PATCH 11/18] Support Samsung R multi-cams
Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555
---
@@ -63,5 +63,5 @@ index ab5ddd12d0..c08bcb9ce2 100644
else
ret = interface->getCameraIdList(cb);
--
2.29.2
2.25.1

6
patches_treble_phh/platform_frameworks_av/0013-audiopolicy-Don-t-crash-on-unknown-audio-devices.patch → patches_treble_phh/platform_frameworks_av/0012-Don-t-crash-on-unknown-audio-devices.patch
View File

@@ -1,7 +1,7 @@
From 0b33dc520b09f9ad74005280920f561356333f99 Mon Sep 17 00:00:00 2001
From fe8421d437012b5909d3dae6dec2969e67260826 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 13/19] [audiopolicy] Don't crash on unknown audio devices
Subject: [PATCH 12/18] Don't crash on unknown audio devices
Change-Id: I2df8d88f742da6a84aa8888cdf19de25444de919
---
@@ -22,5 +22,5 @@ index c6db471c8c..a76da4569b 100644
"extension type",
reinterpret_cast<const char*>(attachedDevice.get()));
--
2.29.2
2.25.1

6
patches_treble_phh/platform_frameworks_av/0014-Reenable-STRATEGY_ROUTING.-This-is-a-leftover-of-tri.patch → patches_treble_phh/platform_frameworks_av/0013-Reenable-STRATEGY_ROUTING.-This-is-a-leftover-of-tri.patch
View File

@@ -1,7 +1,7 @@
From f9a6347168b123aa485e642fa0c63eaef0be0d30 Mon Sep 17 00:00:00 2001
From d3d598ad4f8d22fefd4248e9fc04fb77c2800ace 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 14/19] Reenable STRATEGY_ROUTING. This is a leftover of tries
Subject: [PATCH 13/18] Reenable STRATEGY_ROUTING. This is a leftover of tries
of 587b198, wrongly commited in 20f869
---
@@ -22,5 +22,5 @@ index 314de7889b..c73c17d1e4 100644
{ "STRATEGY_CALL_ASSISTANT", STRATEGY_CALL_ASSISTANT },
};
--
2.29.2
2.25.1

6
patches_treble_phh/platform_frameworks_av/0015-Use-a-fake-volume-policy-when-none-has-been-found.patch → patches_treble_phh/platform_frameworks_av/0014-Use-a-fake-volume-policy-when-none-has-been-found.patch
View File

@@ -1,7 +1,7 @@
From 3fe99a1ab087bfc46cd4c1f190239fe422435a7f Mon Sep 17 00:00:00 2001
From f150ef9a8d0776fbd2123662aac7315ba7bd48de 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 15/19] Use a fake volume policy when none has been found
Subject: [PATCH 14/18] 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.
@@ -33,5 +33,5 @@ index 81e803fa7f..340eb1b358 100644
ALOGE("No readable audio policy config file found");
return BAD_VALUE;
--
2.29.2
2.25.1

6
patches_treble_phh/platform_frameworks_av/0016-Not-all-sources-in-a-route-are-valid.-Dont-ignore-th.patch → patches_treble_phh/platform_frameworks_av/0015-Not-all-sources-in-a-route-are-valid.-Dont-ignore-th.patch
View File

@@ -1,7 +1,7 @@
From ed52289663535821829ebdd1241471d72e0f9d2f Mon Sep 17 00:00:00 2001
From 244b0d93a9a1c3d2425b50c11f5c1abf310d21f9 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 16/19] Not all sources in a route are valid. Dont ignore the
Subject: [PATCH 15/18] Not all sources in a route are valid. Dont ignore the
whole route because of one broken source
Change-Id: If8a51740e71bef3a4738262ad7b43a337b0ec36d
@@ -23,5 +23,5 @@ index a76da4569b..2ff11ddbab 100644
return BAD_VALUE;
} else if (source == NULL) {
--
2.29.2
2.25.1

6
patches_treble_phh/platform_frameworks_av/0017-When-aux-cameras-are-enabled-ignore-system-only-came.patch → patches_treble_phh/platform_frameworks_av/0016-When-aux-cameras-are-enabled-ignore-system-only-came.patch
View File

@@ -1,7 +1,7 @@
From 3db998a6d6224eda055820b23ff7db1e3b49b555 Mon Sep 17 00:00:00 2001
From f69403f665a91492fcfd5d2afe52b8e88c903b85 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 17/19] When aux cameras are enabled, ignore "system only"
Subject: [PATCH 16/18] When aux cameras are enabled, ignore "system only"
camera flag (it shouldnt be q security issue since secure cameras are listed
otherwise)
@@ -31,5 +31,5 @@ index c08bcb9ce2..5a68fe8cc9 100644
}
return SystemCameraKind::PUBLIC;
--
2.29.2
2.25.1

6
patches_treble_phh/platform_frameworks_av/0018-APM-Restore-R-and-Q-behavior-respectively-for-teleph.patch → patches_treble_phh/platform_frameworks_av/0017-APM-Restore-R-and-Q-behavior-respectively-for-teleph.patch
View File

@@ -1,7 +1,7 @@
From 29a38afa10725fefa574fa46e63d6f0e93b62952 Mon Sep 17 00:00:00 2001
From 2140c752c78511852fef8fe2320d62ff88fb4a6c Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Tue, 19 Oct 2021 21:16:55 -0400
Subject: [PATCH 18/19] APM: Restore R and Q behavior respectively for
Subject: [PATCH 17/18] APM: Restore R and Q behavior respectively for
telephony audio
This conditionally reverts part of 51c9cc (S) and afd4ce (R) when the
@@ -102,5 +102,5 @@ index 98f96d1951..e8b19091d5 100644
HwAudioOutputCollection mHwOutputs;
SourceClientCollection mAudioSources;
--
2.29.2
2.25.1

6
patches_treble_phh/platform_frameworks_av/0019-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch → patches_treble_phh/platform_frameworks_av/0018-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch
View File

@@ -1,7 +1,7 @@
From 9f4bc135f5863b4da0a3092db56dee499be6c2a7 Mon Sep 17 00:00:00 2001
From e7f31e63f87dd23e421645783a672ce00e9f1122 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 19/19] Revert "Remove support for audio HAL V2 from the
Subject: [PATCH 18/18] Revert "Remove support for audio HAL V2 from the
framework"
This reverts commit cbf517f837f7bf8a59f3ff8aa1e0e3e19612e251.
@@ -69,5 +69,5 @@ index a2c6e8aeba..4e360be7e8 100644
name: "libaudiohal@4.0",
defaults: ["libaudiohal_default"],
--
2.29.2
2.25.1

4
patches_treble_phh/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
View File

@@ -1,4 +1,4 @@
From cca2f852f59bc76fb4228c44a5c58a39cb0f3bba Mon Sep 17 00:00:00 2001
From ed69eff0e245bc8a8b7c3334b5c30323a09dbfc3 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/24] Fallback to stupid autobrightness if brightness values
@@ -14,7 +14,7 @@ Change-Id: Ieb679b34239013a5e31b34cb010b12febd9ef6d9
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
index 4c9d0f2691b3..4ad21835c1ad 100644
index 2ae5cbbbf24b..9cd8dc663cfa 100644
--- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java
+++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
@@ -172,7 +172,12 @@ public class DisplayDeviceConfig {

6
patches_treble_phh/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch
View File

@@ -1,4 +1,4 @@
From c11becc169cecb489e6bc3e75f7eb42af349aa3b Mon Sep 17 00:00:00 2001
From c3bc53d43b9c4789bab8c532c44cc6f423810801 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/24] Relax requirement for visible flag to sdcards
@@ -13,10 +13,10 @@ 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 69c29269b7a9..72d37655c1e5 100644
index 8727932a87f7..f58f952d19e2 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -1579,7 +1579,8 @@ class StorageManagerService extends IStorageManager.Stub
@@ -1582,7 +1582,8 @@ class StorageManagerService extends IStorageManager.Stub
// Adoptable public disks are visible to apps, since they meet
// public API requirement of being in a stable location.

2
patches_treble_phh/platform_frameworks_base/0003-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
View File

@@ -1,4 +1,4 @@
From 1660aee7805afa51f230552fb8724f86f27c1129 Mon Sep 17 00:00:00 2001
From 9dda80f5f617988755425931377956386d70a703 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/24] Don't crash if there is IR HAL is not declared

6
patches_treble_phh/platform_frameworks_base/0004-Show-APN-Settings-for-CDMA-carriers.patch
View File

@@ -1,4 +1,4 @@
From 4796112133b072b8e4a2d05ace920c6a38a065d7 Mon Sep 17 00:00:00 2001
From 639661b3368671a56a3a2b114d6ffb5c1e6ee95f 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/24] Show APN Settings for CDMA carriers
@@ -8,10 +8,10 @@ Subject: [PATCH 04/24] 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 72ad23b8edb1..1b35fe483eb4 100644
index 45fd7a3467c4..92d6d9868da6 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -5154,7 +5154,7 @@ public class CarrierConfigManager {
@@ -5283,7 +5283,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_MDN_IS_ADDITIONAL_VOICEMAIL_NUMBER_BOOL, false);
sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
sDefaults.putBoolean(KEY_PREFER_2G_BOOL, true);

4
patches_treble_phh/platform_frameworks_base/0005-Re-order-services-so-that-it-works-even-without-qtag.patch
View File

@@ -1,4 +1,4 @@
From 1afba32ac67360be35b6e7fe054932532efbbf20 Mon Sep 17 00:00:00 2001
From a80899cb43a7a0876e2484807dea69c7ddb0b3be 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/24] Re-order services so that it works even without qtaguid
@@ -9,7 +9,7 @@ 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 84be7f5809e6..58f7f7dacc6d 100644
index cfefffcdd2e8..197fed7c8834 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -845,6 +845,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

2
patches_treble_phh/platform_frameworks_base/0006-Support-samsung-Pie-and-Q-light-hal.patch
View File

@@ -1,4 +1,4 @@
From 7bb10322e9b9c0f89ff1f05412c5a1816380c1d6 Mon Sep 17 00:00:00 2001
From b16ff9568fb76c327e71d32878c6b182a3d8acd4 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/24] Support samsung Pie and Q light hal

8
patches_treble_phh/platform_frameworks_base/0007-Add-support-for-samsung-touch-physical-and-hover-pro.patch
View File

@@ -1,4 +1,4 @@
From 7a73ac08b22ed3458e78dd03c2ca373f396d5396 Mon Sep 17 00:00:00 2001
From 14f642d18be9bb7de7ea4409021880d8ae0c279b 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/24] 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 abbe13ac260f..7ee297c60539 100644
index 1224902aa7be..00fab25350dc 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -1671,6 +1671,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
@@ -1700,6 +1700,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 abbe13ac260f..7ee297c60539 100644
if (mProximitySensor != null) {
mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
TYPICAL_PROXIMITY_THRESHOLD);
@@ -2415,6 +2436,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
@@ -2465,6 +2486,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
public void onSensorChanged(SensorEvent event) {
if (mProximitySensorEnabled) {
final long time = SystemClock.uptimeMillis();

6
patches_treble_phh/platform_frameworks_base/0008-Always-allow-overriding-the-number-of-work-profiles.patch
View File

@@ -1,4 +1,4 @@
From f293d063501c95f9d1bfdcac894544a16ecf56b9 Mon Sep 17 00:00:00 2001
From 433f76bd4145480f67496d409e01a0f8b235879f 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/24] Always allow overriding the number of work profiles
@@ -9,10 +9,10 @@ Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index eff1e3b5377f..66296912ba98 100644
index 826370006dca..925ab6e6b77f 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -5820,12 +5820,8 @@ public class UserManagerService extends IUserManager.Stub {
@@ -5825,12 +5825,8 @@ public class UserManagerService extends IUserManager.Stub {
*/
private static int getMaxUsersOfTypePerParent(UserTypeDetails userTypeDetails) {
final int defaultMax = userTypeDetails.getMaxAllowedPerParent();

2
patches_treble_phh/platform_frameworks_base/0009-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
View File

@@ -1,4 +1,4 @@
From e83aa5ea72c3063a337e471db7c39485e23a33a0 Mon Sep 17 00:00:00 2001
From 2e867d814f8f7675058085aea23b5cb95f8588f9 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/24] HOME deserves to wake-up devices just as well as back

6
patches_treble_phh/platform_frameworks_base/0010-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch
View File

@@ -1,4 +1,4 @@
From 7edc52f626f669f0330fc411ceb360a5cd2ed21b Mon Sep 17 00:00:00 2001
From acf92f0e0d9efaf2453aacb16b58eccb914094c4 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/24] 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 7ee297c60539..759720ba4f71 100644
index 00fab25350dc..3c49a01e00b4 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -1695,6 +1695,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
@@ -1724,6 +1724,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
if (mProximitySensor != null) {
mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(),
TYPICAL_PROXIMITY_THRESHOLD);

6
patches_treble_phh/platform_frameworks_base/0011-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
View File

@@ -1,4 +1,4 @@
From 1b0ebec45a3cbc0e0a7edb9d3e63c85901c7efbf Mon Sep 17 00:00:00 2001
From cc5cb64f17283c81d884e75ee38ef6c292d3ca46 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/24] 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 6f7a7cf152b8..58b665add2cf 100644
index f0ebe290c837..76af7630819c 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -989,9 +989,11 @@ public final class PowerManagerService extends SystemService
@@ -993,9 +993,11 @@ public final class PowerManagerService extends SystemService
if (min == INVALID_BRIGHTNESS_IN_CONFIG || max == INVALID_BRIGHTNESS_IN_CONFIG
|| def == INVALID_BRIGHTNESS_IN_CONFIG) {

2
patches_treble_phh/platform_frameworks_base/0012-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
View File

@@ -1,4 +1,4 @@
From 6a5b471745545ff85f87d1eb37d7b6310869f403 Mon Sep 17 00:00:00 2001
From 42ab9d35ed55b576d7e7257a18fd984c79d63b9b 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/24] Re-implement fnmatch-like behaviour for RRO java-side

10
patches_treble_phh/platform_frameworks_base/0013-Make-rounded-corners-padding-overridable-with-persis.patch
View File

@@ -1,4 +1,4 @@
From bd31f40a9c03f568e6dfa1defbe1fb73d8a57a9a Mon Sep 17 00:00:00 2001
From 2319811d1b5e5055c236807ce0ff8be759056741 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/24] 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 77906abce625..8cbfefcb4fea 100644
index 84b961e7c48a..a5150000f47c 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
@@ -22,6 +22,7 @@ import android.content.res.Configuration;
@@ -23,7 +23,7 @@ index 77906abce625..8cbfefcb4fea 100644
import android.util.AttributeSet;
import android.util.Pair;
import android.view.DisplayCutout;
@@ -219,8 +220,10 @@ public class QuickStatusBarHeader extends FrameLayout {
@@ -234,8 +235,10 @@ public class QuickStatusBarHeader extends FrameLayout {
mConfigShowBatteryEstimate = resources.getBoolean(R.bool.config_showBatteryEstimateQSBH);
@@ -37,7 +37,7 @@ index 77906abce625..8cbfefcb4fea 100644
int qsOffsetHeight = resources.getDimensionPixelSize(
com.android.internal.R.dimen.quick_qs_offset_height);
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 e272d2713e2a..ed0abcce5b06 100644
index 788665269edb..f9c6ebbd26e3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
@@ -30,6 +30,7 @@ import android.graphics.Color;
@@ -48,7 +48,7 @@ index e272d2713e2a..ed0abcce5b06 100644
import android.util.AttributeSet;
import android.util.Pair;
import android.util.TypedValue;
@@ -200,8 +201,10 @@ public class KeyguardStatusBarView extends RelativeLayout implements
@@ -196,8 +197,10 @@ public class KeyguardStatusBarView extends RelativeLayout implements
R.dimen.display_cutout_margin_consumption);
mShowPercentAvailable = getContext().getResources().getBoolean(
com.android.internal.R.bool.config_battery_percentage_setting_available);

4
patches_treble_phh/platform_frameworks_base/0014-Remove-useless-notification-about-console-service-be.patch
View File

@@ -1,4 +1,4 @@
From 322fd1c3aadbfce8863360ce1e64ff58f00ce24c Mon Sep 17 00:00:00 2001
From 3e636d6cf6d3f10c5578ba79f8246278b5b1205f 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/24] Remove useless notification about "console" service
@@ -9,7 +9,7 @@ Subject: [PATCH 14/24] 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 953e6e24236f..856ecc7c469d 100644
index c78d5d538f8d..8739a5913091 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -4775,7 +4775,7 @@ public class ActivityManagerService extends IActivityManager.Stub

6
patches_treble_phh/platform_frameworks_base/0015-Revert-Remove-unused-SystemProperties.set.patch
View File

@@ -1,4 +1,4 @@
From a274dd1fdc784a82a41ca6eff4acc899fd3adb44 Mon Sep 17 00:00:00 2001
From b78db2908f199c2ecdbb2c9e8f08cc96c399d986 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/24] Revert "Remove unused SystemProperties.set"
@@ -11,10 +11,10 @@ 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 255a61266ebf..7243221f0998 100644
index 989663406a6b..9d65e6385db3 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -7405,6 +7405,75 @@ public class TelephonyManager {
@@ -7406,6 +7406,75 @@ public class TelephonyManager {
}
}

4
patches_treble_phh/platform_frameworks_base/0016-TelephonyManager-bring-back-getNetworkClass.patch
View File

@@ -1,4 +1,4 @@
From 622df54f19543a5dd66a8446f58ed8818ed7aa6f Mon Sep 17 00:00:00 2001
From 557bd0cca4cee3c3137cba9035eb254772436eae 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/24] 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 7243221f0998..674d09c3bfd8 100644
index 9d65e6385db3..b0c640547e0e 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -3042,6 +3042,64 @@ public class TelephonyManager {

8
patches_treble_phh/platform_frameworks_base/0017-TelephonyManager-add-API-annotations-for-setTelephon.patch
View File

@@ -1,4 +1,4 @@
From 2cfd2dbee3c7744895d5af492661aad3297f6f97 Mon Sep 17 00:00:00 2001
From b51669eff63818a15122ee274e50792b2772ecba 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/24] TelephonyManager: add API annotations for
@@ -14,10 +14,10 @@ Subject: [PATCH 17/24] 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 674d09c3bfd8..a7f32cb0cd4b 100644
index b0c640547e0e..c11232326370 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -7469,7 +7469,7 @@ public class TelephonyManager {
@@ -7470,7 +7470,7 @@ public class TelephonyManager {
* @hide
*/
@UnsupportedAppUsage
@@ -26,7 +26,7 @@ index 674d09c3bfd8..a7f32cb0cd4b 100644
String propVal = "";
String p[] = null;
String prop = SystemProperties.get(property);
@@ -7523,7 +7523,8 @@ public class TelephonyManager {
@@ -7524,7 +7524,8 @@ public class TelephonyManager {
*
* @hide
*/

2
patches_treble_phh/platform_frameworks_base/0018-Fix-Wakelock-issue.patch
View File

@@ -1,4 +1,4 @@
From 10b2cd4edfefad6f2bff633ade040cfa796be8ec Mon Sep 17 00:00:00 2001
From 9b926fe1972bf2f8139a8a00b2f452d4e3cabdea 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/24] Fix Wakelock issue

4
patches_treble_phh/platform_frameworks_base/0019-SystemUI-Use-AVCProfileMain-for-screen-recorder.patch
View File

@@ -1,4 +1,4 @@
From afb9dc934893cffcb4710beac437d0b618277305 Mon Sep 17 00:00:00 2001
From ec9c979cb9c2399380292d775d068ce596ba855d Mon Sep 17 00:00:00 2001
From: Arne Coucheron <arco68@gmail.com>
Date: Thu, 5 Nov 2020 05:38:44 +0100
Subject: [PATCH 19/24] SystemUI: Use AVCProfileMain for screen recorder
@@ -13,7 +13,7 @@ Change-Id: Iac23480e080edf4300e6f411c3394c0b41030daa
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
index 26781f4ccf09..9a6e657876f0 100644
index 2133cf63d1c3..6100b6030544 100644
--- a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
+++ b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
@@ -135,7 +135,7 @@ public class ScreenMediaRecorder {

2
patches_treble_phh/platform_frameworks_base/0020-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
View File

@@ -1,4 +1,4 @@
From 04ed3039c7f353b57d61436c79676be048ab634c Mon Sep 17 00:00:00 2001
From e63f6286978d095c26a24253b503c3964db6ab68 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 20/24] Automatically detect pick up sensor, so that an overlay

2
patches_treble_phh/platform_frameworks_base/0021-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
View File

@@ -1,4 +1,4 @@
From e512110dd600e59f89408789263a926a47a09d6e Mon Sep 17 00:00:00 2001
From 69a948909ec0ac6d2fb89fdfeadee0df09437df0 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 21/24] Catch broken mainBuiltInDisplayCutoutRectApproximation

2
patches_treble_phh/platform_frameworks_base/0022-backlight-Fix-backlight-control-on-Galaxy-S9.patch
View File

@@ -1,4 +1,4 @@
From e9eddb9bfbc3d23e6538046cbd006e63ca0a40c1 Mon Sep 17 00:00:00 2001
From 97d62e3f56c39729d3756166599999216fbc2639 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 22/24] backlight: Fix backlight control on Galaxy S9(+)

14
patches_treble_phh/platform_frameworks_base/0023-Add-support-for-app-signature-spoofing.patch
View File

@@ -1,4 +1,4 @@
From 6efec3a6f3f2dfbe89fb7b2b72d24110a94aa2d6 Mon Sep 17 00:00:00 2001
From 38da0b29efb2577ebd9295a45617160e3caec696 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Sat, 16 Oct 2021 05:27:57 -0700
Subject: [PATCH 23/24] Add support for app signature spoofing
@@ -56,10 +56,10 @@ index 1de47b548a5c..52c7ea2e1321 100644
field public static final String MICROPHONE = "android.permission-group.MICROPHONE";
field public static final String NEARBY_DEVICES = "android.permission-group.NEARBY_DEVICES";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index bad79eb13749..e4475497b12e 100644
index cd6af189a04a..318a7f06494e 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -3186,6 +3186,21 @@
@@ -3189,6 +3189,21 @@
android:description="@string/permdesc_getPackageSize"
android:protectionLevel="normal" />
@@ -82,7 +82,7 @@ index bad79eb13749..e4475497b12e 100644
{@link android.content.pm.PackageManager#addPackageToPreferred}
for details. -->
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index a99a22009e3b..81ca9b23ae70 100644
index b58638cc3ade..8cf98fa56bf6 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -880,6 +880,18 @@
@@ -105,10 +105,10 @@ index a99a22009e3b..81ca9b23ae70 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 46b0b600960d..a88e518eb624 100644
index b77483012ee8..04f55ae83ef0 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -3299,6 +3299,29 @@ public class PackageManagerService extends IPackageManager.Stub
@@ -3325,6 +3325,29 @@ public class PackageManagerService extends IPackageManager.Stub
return result;
}
@@ -138,7 +138,7 @@ index 46b0b600960d..a88e518eb624 100644
public final PackageInfo generatePackageInfo(PackageSetting ps, int flags, int userId) {
if (!mUserManager.exists(userId)) return null;
if (ps == null) {
@@ -3327,12 +3350,14 @@ public class PackageManagerService extends IPackageManager.Stub
@@ -3353,12 +3376,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

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

@@ -1,4 +1,4 @@
From 3b5b5acf725b96498f7ad7d613c689ab80486a5b Mon Sep 17 00:00:00 2001
From 4881811426c4f2f28d1f053ef73441c53d1238a5 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/24] Revert "Switch long-press power behavior in AOSP."
@@ -9,7 +9,7 @@ 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 db43b5b31e7e..8cf90cb4b240 100644
index 0abeff91e511..b7dfd49b7b78 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -955,7 +955,7 @@
@@ -19,9 +19,9 @@ index db43b5b31e7e..8cf90cb4b240 100644
- <integer name="config_longPressOnPowerBehavior">5</integer>
+ <integer name="config_longPressOnPowerBehavior">1</integer>
<!-- Whether the setting to change long press on power behaviour from default to assistant (5)
is available in Settings.
@@ -973,7 +973,7 @@
<!-- The time in milliseconds after which a press on power button is considered "long". -->
<integer name="config_longPressOnPowerDurationMs">500</integer>
@@ -987,7 +987,7 @@
1 - Mute toggle
2 - Global actions menu
-->

33
patches_treble_phh/platform_frameworks_opt_net_ims/0001-Pie-MTK-IMS-calls-static-ImsManager.updateImsService.patch Normal file
View File

@@ -0,0 +1,33 @@
From 5e51de4ac017a91e01dbf5514f433adcdd191e63 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 14 Nov 2021 13:47:29 -0500
Subject: [PATCH] Pie MTK IMS calls static
ImsManager.updateImsServiceConfig(Context,int,boolean). Bring it back
Change-Id: I3dd66d436629d37c8ec795df6569736195ae570e
---
src/java/com/android/ims/ImsManager.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index 345cbc5..e7e3722 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -1642,6 +1642,14 @@ public class ImsManager implements FeatureUpdates {
return true;
}
+ public static void updateImsServiceConfig(Context context, int phoneId, boolean force) {
+ ImsManager mgr = ImsManager.getInstance(context, phoneId);
+ if (mgr != null) {
+ mgr.updateImsServiceConfig();
+ }
+ Rlog.e(TAG, "updateImsServiceConfig: ImsManager null, returning without update.");
+ }
+
/**
* Push configuration updates to the ImsService implementation.
*/
--
2.25.1

16
patches_treble_phh/platform_frameworks_opt_telephony/0001-telephony-forward-port-support-for-forceCognitive.patch
View File

@@ -1,7 +1,7 @@
From a8df36e780d5dd56d4d2c90be36e3a343abb1e49 Mon Sep 17 00:00:00 2001
From 2b520b6933e681f69925b6c974742cff29cf47df Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 13 Oct 2019 17:21:31 +0800
Subject: [PATCH 1/2] telephony: forward-port support for forceCognitive
Subject: [PATCH 1/3] telephony: forward-port support for forceCognitive
* This is needed on some MTK devices. Android 10 refactored some code,
so now the "non-persistent/cognitive" filter is relocated to RIL and
@@ -14,7 +14,7 @@ Change-Id: I5e93cbef317b7973e0dc1125cfc3cc576a1cf9fa
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index bd71b0b11d..146b26d62f 100644
index 56c81d1da3..af28bd8f9a 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -71,6 +71,7 @@ import android.os.HwBinder;
@@ -24,8 +24,8 @@ index bd71b0b11d..146b26d62f 100644
+import android.os.SystemProperties;
import android.os.RemoteException;
import android.os.SystemClock;
import android.os.WorkSource;
@@ -4773,7 +4774,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
import android.os.SystemProperties;
@@ -4829,7 +4830,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
for (DataProfile dp : dps) {
// For v1.0 to v1.2, we only send data profiles that has the persistent
// (a.k.a modem cognitive) bit set to true.
@@ -36,10 +36,10 @@ index bd71b0b11d..146b26d62f 100644
}
}
diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
index 5bfe15bca7..674789c979 100644
index 21b8c4f108..2c5ab7d104 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
@@ -2150,8 +2150,9 @@ public class DcTracker extends Handler {
@@ -2170,8 +2170,9 @@ public class DcTracker extends Handler {
}
// profile id is only meaningful when the profile is persistent on the modem.
@@ -51,5 +51,5 @@ index 5bfe15bca7..674789c979 100644
if (profileId == DATA_PROFILE_DEFAULT) {
profileId = getApnProfileID(apnContext.getApnType());
--
2.29.2
2.25.1

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

@@ -1,7 +1,7 @@
From a5a6afc7a7dd2d402960b60b1a7b084b89e67b8c Mon Sep 17 00:00:00 2001
From d230672d53c64266bcf699d27c8951975f918d3f 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/2] Telephony: Don not call onUssdRelease for Huawei RIL
Subject: [PATCH 2/3] Telephony: Don not call onUssdRelease for Huawei RIL
Huawei RIL doesn't seem to work properly with USSD_MODE_NW_RELEASE,
always releasing USSD when it should be finished instead.
@@ -13,10 +13,10 @@ 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 a034392cee..c82af4c432 100644
index aebd91659d..de27887da4 100644
--- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
@@ -2723,7 +2723,11 @@ public class GsmCdmaPhone extends Phone {
@@ -2745,7 +2745,11 @@ public class GsmCdmaPhone extends Phone {
if (found != null) {
// Complete pending USSD
if (isUssdRelease) {
@@ -30,5 +30,5 @@ index a034392cee..c82af4c432 100644
found.onUssdFinishedError();
} else {
--
2.29.2
2.25.1

27
patches_treble_phh/platform_frameworks_opt_telephony/0003-Fix-baseband-being-too-long-to-fit-into-a-91-chars-p.patch Normal file
View File

@@ -0,0 +1,27 @@
From cc77f6e8d407e9aa7c178c014ce7fb2faf23092a 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/3] Fix baseband being too long to fit into a 91 chars
property, preventing telephony subsystem from starting
Change-Id: I1762e4a8cc137626be89f350229d6be162bdaf57
---
src/java/com/android/internal/telephony/GsmCdmaPhone.java | 2 +-
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 de27887da4..be539b6537 100644
--- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
@@ -3038,7 +3038,7 @@ public class GsmCdmaPhone extends Phone {
String version = (String)ar.result;
if (version != null) {
int length = version.length();
- final int MAX_VERSION_LEN = SystemProperties.PROP_VALUE_MAX/2;
+ final int MAX_VERSION_LEN = SystemProperties.PROP_VALUE_MAX/2 - 2;
TelephonyManager.from(mContext).setBasebandVersionForPhone(getPhoneId(),
length <= MAX_VERSION_LEN ? version
: version.substring(length - MAX_VERSION_LEN, length));
--
2.25.1

8
patches_treble_phh/platform_system_vold/0002-Allow-deletion-of-symlink.patch → patches_treble_phh/platform_system_vold/0001-Allow-deletion-of-symlink.patch
View File

@@ -1,7 +1,7 @@
From a4ae95a2de9f912a4e4aca075a28aa4d0ff886b9 Mon Sep 17 00:00:00 2001
From 990be9e3d37ce43afb37303b3503f0999bc82ca2 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 17 Feb 2018 19:39:38 +0100
Subject: [PATCH 2/6] Allow deletion of symlink
Subject: [PATCH 1/7] Allow deletion of symlink
Change-Id: I9731895f88729072297f753088583aabbe6990f4
---
@@ -9,7 +9,7 @@ Change-Id: I9731895f88729072297f753088583aabbe6990f4
1 file changed, 1 insertion(+)
diff --git a/FsCrypt.cpp b/FsCrypt.cpp
index 04def5c..c7de48e 100644
index 04def5c4..c7de48e1 100644
--- a/FsCrypt.cpp
+++ b/FsCrypt.cpp
@@ -315,6 +315,7 @@ static bool prepare_dir(const std::string& dir, mode_t mode, uid_t uid, gid_t gi
@@ -21,5 +21,5 @@ index 04def5c..c7de48e 100644
return false;
}
--
2.29.2
2.25.1

54
patches_treble_phh/platform_system_vold/0001-Fallback-to-non-rollback-resistant-keys-if-not-avail.patch
View File

@@ -1,54 +0,0 @@
From 30e1b738f07d636015d0a4f6b4c3fd214b7b474f Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 5 Oct 2021 16:17:15 -0400
Subject: [PATCH 1/6] Fallback to non-rollback resistant keys if not available
Boot on Mediatek devices was broken with:
~ Add ROLLBACK_RESISTANCE tag to key usage
Change-Id: I0ab7103c317c70779dee03dce25ba9c9da1629f4
---
KeyStorage.cpp | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/KeyStorage.cpp b/KeyStorage.cpp
index 93c5c29..ef089ad 100644
--- a/KeyStorage.cpp
+++ b/KeyStorage.cpp
@@ -378,12 +378,15 @@ static KeymasterOperation BeginKeymasterOp(Keymaster& keymaster, const std::stri
static bool encryptWithKeymasterKey(Keymaster& keymaster, const std::string& dir,
const km::AuthorizationSet& keyParams,
const KeyBuffer& message, std::string* ciphertext) {
- km::AuthorizationSet opParams =
+ auto opParams =
km::AuthorizationSetBuilder()
- .Authorization(km::TAG_ROLLBACK_RESISTANCE)
.Authorization(km::TAG_PURPOSE, km::KeyPurpose::ENCRYPT);
+ auto opParamsWithRollback = opParams;
+ opParamsWithRollback.Authorization(km::TAG_ROLLBACK_RESISTANCE);
+
km::AuthorizationSet outParams;
- auto opHandle = BeginKeymasterOp(keymaster, dir, keyParams, opParams, &outParams);
+ auto opHandle = BeginKeymasterOp(keymaster, dir, keyParams, opParamsWithRollback, &outParams);
+ if (!opHandle) opHandle = BeginKeymasterOp(keymaster, dir, keyParams, opParams, &outParams);
if (!opHandle) return false;
auto nonceBlob = outParams.GetTagValue(km::TAG_NONCE);
if (!nonceBlob) {
@@ -410,9 +413,12 @@ static bool decryptWithKeymasterKey(Keymaster& keymaster, const std::string& dir
auto bodyAndMac = ciphertext.substr(GCM_NONCE_BYTES);
auto opParams = km::AuthorizationSetBuilder()
.Authorization(km::TAG_NONCE, nonce)
- .Authorization(km::TAG_ROLLBACK_RESISTANCE)
.Authorization(km::TAG_PURPOSE, km::KeyPurpose::DECRYPT);
- auto opHandle = BeginKeymasterOp(keymaster, dir, keyParams, opParams, nullptr);
+ auto opParamsWithRollback = opParams;
+ opParamsWithRollback.Authorization(km::TAG_ROLLBACK_RESISTANCE);
+
+ auto opHandle = BeginKeymasterOp(keymaster, dir, keyParams, opParamsWithRollback, nullptr);
+ if (!opHandle) opHandle = BeginKeymasterOp(keymaster, dir, keyParams, opParams, nullptr);
if (!opHandle) return false;
if (!opHandle.updateCompletely(bodyAndMac, message)) return false;
if (!opHandle.finish(nullptr)) return false;
--
2.29.2

8
patches_treble_phh/platform_system_vold/0003-Support-Samsung-s-implementation-of-exfat-called-sdf.patch → patches_treble_phh/platform_system_vold/0002-Support-Samsung-s-implementation-of-exfat-called-sdf.patch
View File

@@ -1,14 +1,14 @@
From 07bbca4e931e960e25f714079f176f31ca218b41 Mon Sep 17 00:00:00 2001
From c31e214cb0f52671514b06ebc6b4e03bddf491bf Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 20 Aug 2018 22:37:54 +0200
Subject: [PATCH 3/6] Support Samsung's implementation of exfat, called sdfat
Subject: [PATCH 2/7] Support Samsung's implementation of exfat, called sdfat
---
fs/Exfat.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/fs/Exfat.cpp b/fs/Exfat.cpp
index 7782dd3..91a4c50 100644
index 7782dd3b..91a4c50d 100644
--- a/fs/Exfat.cpp
+++ b/fs/Exfat.cpp
@@ -35,7 +35,7 @@ static const char* kFsckPath = "/system/bin/fsck.exfat";
@@ -40,5 +40,5 @@ index 7782dd3..91a4c50 100644
}
--
2.29.2
2.25.1

8
patches_treble_phh/platform_system_vold/0004-Sony-has-texfat-exfat-fs.patch → patches_treble_phh/platform_system_vold/0003-Sony-has-texfat-exfat-fs.patch
View File

@@ -1,14 +1,14 @@
From 33b5d2f1da3e8c775baf042f734c899af68a8a75 Mon Sep 17 00:00:00 2001
From 457e5c667aa50a8e944a5a20dadb6e0c4cefd7b4 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 28 Jan 2020 00:27:17 +0100
Subject: [PATCH 4/6] Sony has `texfat` exfat fs
Subject: [PATCH 3/7] Sony has `texfat` exfat fs
---
fs/Exfat.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/fs/Exfat.cpp b/fs/Exfat.cpp
index 91a4c50..6c49c10 100644
index 91a4c50d..6c49c10c 100644
--- a/fs/Exfat.cpp
+++ b/fs/Exfat.cpp
@@ -35,7 +35,11 @@ static const char* kFsckPath = "/system/bin/fsck.exfat";
@@ -34,5 +34,5 @@ index 91a4c50..6c49c10 100644
return 0;
}
--
2.29.2
2.25.1

8
patches_treble_phh/platform_system_vold/0005-Failing-to-create-facedata-shouldn-t-be-fatal.patch → patches_treble_phh/platform_system_vold/0004-Failing-to-create-facedata-shouldn-t-be-fatal.patch
View File

@@ -1,7 +1,7 @@
From c8c2f84551ba8cf706b5ca1e880f216261f78100 Mon Sep 17 00:00:00 2001
From 5684e411afc3cdcf5e66e9bade31fde768c3373b Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 7 Mar 2020 14:49:09 +0100
Subject: [PATCH 5/6] Failing to create facedata shouldn't be fatal
Subject: [PATCH 4/7] Failing to create facedata shouldn't be fatal
Some Pie vendors create it on their own, so SELinux would deny that
Also not all devices have face unlock anyway
@@ -12,7 +12,7 @@ See https://github.com/phhusson/treble_experimentations/issues/1119
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/vold_prepare_subdirs.cpp b/vold_prepare_subdirs.cpp
index e2afb81..de863ff 100644
index e2afb815..de863ffc 100644
--- a/vold_prepare_subdirs.cpp
+++ b/vold_prepare_subdirs.cpp
@@ -193,7 +193,7 @@ static bool prepare_subdirs(const std::string& volume_uuid, int user_id, int fla
@@ -34,5 +34,5 @@ index e2afb81..de863ff 100644
}
}
--
2.29.2
2.25.1

8
patches_treble_phh/platform_system_vold/0006-Every-voldmanaged-storage-is-adoptable.patch → patches_treble_phh/platform_system_vold/0005-Every-voldmanaged-storage-is-adoptable.patch
View File

@@ -1,14 +1,14 @@
From 425cd7837ca789af3eb79e659851b67edb87d431 Mon Sep 17 00:00:00 2001
From 37b7e342b023af7f1c39335ab61e64e446057234 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 11 Mar 2020 14:02:35 +0100
Subject: [PATCH 6/6] Every voldmanaged storage is adoptable
Subject: [PATCH 5/7] Every voldmanaged storage is adoptable
---
main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main.cpp b/main.cpp
index 1f85fb5..52aa896 100644
index 1f85fb53..52aa896d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -257,7 +257,7 @@ static int process_config(VolumeManager* vm, VoldConfigs* configs) {
@@ -21,5 +21,5 @@ index 1f85fb5..52aa896 100644
configs->has_adoptable = true;
}
--
2.29.2
2.25.1

28
patches_treble_phh/platform_system_vold/0006-Log-support-for-exfat-texfat-FS-driver-names.patch Normal file
View File

@@ -0,0 +1,28 @@
From 02318d958b630413efe73d0454a277f1b9d8e020 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 24 Nov 2021 15:50:30 -0500
Subject: [PATCH 6/7] Log support for exfat/texfat FS driver names
Change-Id: I5ae38741374b25b84595a9eae9bdda7afe2cac05
---
main.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/main.cpp b/main.cpp
index 52aa896d..86e0aa52 100644
--- a/main.cpp
+++ b/main.cpp
@@ -69,7 +69,9 @@ int main(int argc, char** argv) {
LOG(DEBUG) << "Detected support for:"
<< (android::vold::IsFilesystemSupported("ext4") ? " ext4" : "")
<< (android::vold::IsFilesystemSupported("f2fs") ? " f2fs" : "")
- << (android::vold::IsFilesystemSupported("vfat") ? " vfat" : "");
+ << (android::vold::IsFilesystemSupported("vfat") ? " vfat" : "")
+ << (android::vold::IsFilesystemSupported("exfat") ? " exfat" : "")
+ << (android::vold::IsFilesystemSupported("texfat") ? " texfat" : "");
VolumeManager* vm;
NetlinkManager* nm;
--
2.25.1

25
patches_treble_phh/platform_system_vold/0007-Don-t-unmount-rw-system.sh-binds.patch Normal file
View File

@@ -0,0 +1,25 @@
From 9612422f1e17dffdf5ed00c4c3abd1c2f3a17656 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 29 Nov 2021 17:49:13 -0500
Subject: [PATCH 7/7] Don't unmount rw-system.sh binds
Change-Id: If9132c21defa8b09879b79a70794c5275d6852d0
---
VolumeManager.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 2697f672..d592c7f5 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -957,6 +957,7 @@ int VolumeManager::unmountAll() {
while ((mentry = getmntent(fp)) != NULL) {
auto test = std::string(mentry->mnt_dir);
if ((StartsWith(test, "/mnt/") &&
+ !StartsWith(test, "/mnt/phh") &&
#ifdef __ANDROID_DEBUGGABLE__
!StartsWith(test, "/mnt/scratch") &&
#endif
--
2.25.1