Compare commits
23 commits
lineage-20
...
lineage-20
Author | SHA1 | Date | |
---|---|---|---|
6cf653fca7 | |||
47f59bc420 | |||
c2d7125184 | |||
e74c9fa94f | |||
a138eb6a0d | |||
82046ec9b1 | |||
d3d4c23cc0 | |||
820ace1a82 | |||
b532458443 | |||
a4caafbd4d | |||
ef892337b1 | |||
1e69ae3a1f | |||
04ab205c03 | |||
a731d0e3a3 | |||
0351de2fe9 | |||
f916711976 | |||
46518ac063 | |||
40b5b327b0 | |||
6309b72994 | |||
e9bf2125fd | |||
b6483242ac | |||
71dd2fd6bd | |||
3ed0ffc41a |
26 changed files with 263 additions and 330 deletions
5
.vscode/settings.json
vendored
Normal file
5
.vscode/settings.json
vendored
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"yaml.schemas": {
|
||||||
|
"https://raw.githubusercontent.com/woodpecker-ci/woodpecker/master/pipeline/schema/schema.json": "file:///home/nyyu/dev/lineage/build/.woodpecker/.build.yml"
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,90 +0,0 @@
|
||||||
variables:
|
|
||||||
- &build_vol '/media/fast/lineage/lineage-20.0:/build'
|
|
||||||
- &tools_vol '/media/fast/lineage/tools:/tools'
|
|
||||||
- &http_vol '/srv/http/drone:/http'
|
|
||||||
- &pub_vol '/mnt/android/lineage:/publish'
|
|
||||||
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- device: mondrianwifi
|
|
||||||
version: 20.0
|
|
||||||
|
|
||||||
pipeline:
|
|
||||||
sync:
|
|
||||||
pull: true
|
|
||||||
image: docker.nyyu.dev/lineage/android
|
|
||||||
commands:
|
|
||||||
- HOME=/home/drone
|
|
||||||
- git config --global user.email 'drone@nyyu.dev'
|
|
||||||
- git config --global user.name 'drone'
|
|
||||||
- cd /build
|
|
||||||
- rm -rf .repo/repo
|
|
||||||
- repo init -u https://github.com/LineageOS-UL/android.git -b lineage-$version
|
|
||||||
- mkdir -p .repo/local_manifests
|
|
||||||
- cp $CI_WORKSPACE/$device.xml .repo/local_manifests/roomservice.xml
|
|
||||||
- repo forall -c 'git reset --hard --quiet' || true
|
|
||||||
- bash $CI_WORKSPACE/sync.sh
|
|
||||||
volumes:
|
|
||||||
- *build_vol
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- manual
|
|
||||||
- cron
|
|
||||||
build:
|
|
||||||
pull: true
|
|
||||||
image: docker.nyyu.dev/lineage/android
|
|
||||||
environment:
|
|
||||||
- BUILD_HOSTNAME=docker
|
|
||||||
commands:
|
|
||||||
- cd /build
|
|
||||||
- bash -c ". build/envsetup.sh && lunch lineage_$device-userdebug && mka bacon -j6"
|
|
||||||
volumes:
|
|
||||||
- *build_vol
|
|
||||||
- *tools_vol
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- manual
|
|
||||||
- cron
|
|
||||||
copy:
|
|
||||||
pull: true
|
|
||||||
image: alpine
|
|
||||||
commands:
|
|
||||||
- rm -f /http/lineage-$version-*-UNOFFICIAL-$device.zip*
|
|
||||||
- mv -f /build/out/target/product/$device/lineage-$version-*-UNOFFICIAL-$device.zip* /http/
|
|
||||||
- cat /build/changelog-$device-$version.md >> /http/changelog-$device-$version.md
|
|
||||||
- ls -lh /http/lineage-$version-*-UNOFFICIAL-$device.zip*
|
|
||||||
volumes:
|
|
||||||
- *build_vol
|
|
||||||
- *http_vol
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- manual
|
|
||||||
- cron
|
|
||||||
clean:
|
|
||||||
pull: true
|
|
||||||
image: alpine
|
|
||||||
commands:
|
|
||||||
- rm -f /build/out/target/product/$device/lineage-$version-*-UNOFFICIAL-$device.zip_* /build/out/target/product/$device/lineage_$device-ota-eng.*.zip
|
|
||||||
- rm -rf /build/out/target/product/$device/obj/PACKAGING/target_files_intermediates/*
|
|
||||||
- find /build/out/target/product/$device -type f -name '*.prop' -exec rm -vf {} +
|
|
||||||
- rm -f /build/changelog-$device-$version.md
|
|
||||||
volumes:
|
|
||||||
- *build_vol
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- manual
|
|
||||||
- cron
|
|
||||||
publish:
|
|
||||||
pull: true
|
|
||||||
image: alpine
|
|
||||||
commands:
|
|
||||||
- mv /http/lineage-$version-*-UNOFFICIAL-$device.zip* /publish/$version/$device/
|
|
||||||
- cat /http/changelog-$device-$version.md >> /publish/$version/$device/changelog.md
|
|
||||||
- rm -f /http/changelog-$device-$version.md
|
|
||||||
- ls -lh /publish/$version/$device/
|
|
||||||
volumes:
|
|
||||||
- *http_vol
|
|
||||||
- *pub_vol
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- deployment
|
|
33
.woodpecker/.build-lte.yml
Normal file
33
.woodpecker/.build-lte.yml
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
variables:
|
||||||
|
- &build_vol '/media/fast/lineage/lineage-20.0:/build'
|
||||||
|
- &tools_vol '/media/fast/lineage/tools:/tools'
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- device: mondrianlte
|
||||||
|
version: 20.0
|
||||||
|
|
||||||
|
skip_clone: true
|
||||||
|
|
||||||
|
pipeline:
|
||||||
|
build:
|
||||||
|
pull: true
|
||||||
|
image: docker.nyyu.dev/lineage/android
|
||||||
|
environment:
|
||||||
|
- BUILD_HOSTNAME=docker
|
||||||
|
commands:
|
||||||
|
- export HOME=/build
|
||||||
|
- cd /build
|
||||||
|
- find /build/out/target/product/$device -type f -name '*.prop' -exec rm -vf {} + || true
|
||||||
|
- bash -c ". build/envsetup.sh && lunch lineage_$device-userdebug && (mka bacon -j6 || (cat out/build_error && exit 1))"
|
||||||
|
volumes:
|
||||||
|
- *build_vol
|
||||||
|
- *tools_vol
|
||||||
|
when:
|
||||||
|
event:
|
||||||
|
- manual
|
||||||
|
- cron
|
||||||
|
|
||||||
|
depends_on:
|
||||||
|
- sync
|
||||||
|
- build-wifi
|
32
.woodpecker/.build-wifi.yml
Normal file
32
.woodpecker/.build-wifi.yml
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
variables:
|
||||||
|
- &build_vol '/media/fast/lineage/lineage-20.0:/build'
|
||||||
|
- &tools_vol '/media/fast/lineage/tools:/tools'
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- device: mondrianwifi
|
||||||
|
version: 20.0
|
||||||
|
|
||||||
|
skip_clone: true
|
||||||
|
|
||||||
|
pipeline:
|
||||||
|
build:
|
||||||
|
pull: true
|
||||||
|
image: docker.nyyu.dev/lineage/android
|
||||||
|
environment:
|
||||||
|
- BUILD_HOSTNAME=docker
|
||||||
|
commands:
|
||||||
|
- export HOME=/build
|
||||||
|
- cd /build
|
||||||
|
- find /build/out/target/product/$device -type f -name '*.prop' -exec rm -vf {} + || true
|
||||||
|
- bash -c ". build/envsetup.sh && lunch lineage_$device-userdebug && (mka bacon -j6 || (cat out/build_error && exit 1))"
|
||||||
|
volumes:
|
||||||
|
- *build_vol
|
||||||
|
- *tools_vol
|
||||||
|
when:
|
||||||
|
event:
|
||||||
|
- manual
|
||||||
|
- cron
|
||||||
|
|
||||||
|
depends_on:
|
||||||
|
- sync
|
24
.woodpecker/.changelog.yml
Normal file
24
.woodpecker/.changelog.yml
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
variables:
|
||||||
|
- &build_vol '/media/fast/lineage/lineage-20.0:/build'
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- device: mondrian
|
||||||
|
version: 20.0
|
||||||
|
|
||||||
|
pipeline:
|
||||||
|
sync:
|
||||||
|
image: docker.nyyu.dev/lineage/android
|
||||||
|
commands:
|
||||||
|
- cd /build
|
||||||
|
- bash $CI_WORKSPACE/changelog.sh
|
||||||
|
volumes:
|
||||||
|
- *build_vol
|
||||||
|
when:
|
||||||
|
event:
|
||||||
|
- manual
|
||||||
|
- cron
|
||||||
|
|
||||||
|
depends_on:
|
||||||
|
- build-wifi
|
||||||
|
- build-lte
|
45
.woodpecker/.copy.yml
Normal file
45
.woodpecker/.copy.yml
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
variables:
|
||||||
|
- &build_vol '/media/fast/lineage/lineage-20.0:/build'
|
||||||
|
- &http_vol '/srv/http/drone:/http'
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- device: mondrianwifi
|
||||||
|
version: 20.0
|
||||||
|
- device: mondrianlte
|
||||||
|
version: 20.0
|
||||||
|
|
||||||
|
skip_clone: true
|
||||||
|
|
||||||
|
pipeline:
|
||||||
|
copy:
|
||||||
|
pull: true
|
||||||
|
image: alpine
|
||||||
|
commands:
|
||||||
|
- rm -f /http/lineage-$version-*-UNOFFICIAL-$device.zip*
|
||||||
|
- mv -f /build/out/target/product/$device/lineage-$version-*-UNOFFICIAL-$device.zip* /http/
|
||||||
|
- cat /build/changelog-mondrian-$version.md >> /http/changelog-$device-$version.md
|
||||||
|
- ls -lh /http/lineage-$version-*-UNOFFICIAL-$device.zip*
|
||||||
|
volumes:
|
||||||
|
- *build_vol
|
||||||
|
- *http_vol
|
||||||
|
when:
|
||||||
|
event:
|
||||||
|
- manual
|
||||||
|
- cron
|
||||||
|
clean:
|
||||||
|
pull: true
|
||||||
|
image: alpine
|
||||||
|
commands:
|
||||||
|
- rm -f /build/out/target/product/$device/lineage-$version-*-UNOFFICIAL-$device.zip_* /build/out/target/product/$device/lineage_$device-ota-eng.*.zip
|
||||||
|
- rm -rf /build/out/target/product/$device/obj/PACKAGING/target_files_intermediates/*
|
||||||
|
- rm -f /build/changelog-$device-$version.md
|
||||||
|
volumes:
|
||||||
|
- *build_vol
|
||||||
|
when:
|
||||||
|
event:
|
||||||
|
- manual
|
||||||
|
- cron
|
||||||
|
|
||||||
|
depends_on:
|
||||||
|
- changelog
|
28
.woodpecker/.publish.yml
Normal file
28
.woodpecker/.publish.yml
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
variables:
|
||||||
|
- &http_vol '/srv/http/drone:/http'
|
||||||
|
- &pub_vol '/mnt/android/lineage:/publish'
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- device: mondrianwifi
|
||||||
|
version: 20.0
|
||||||
|
- device: mondrianlte
|
||||||
|
version: 20.0
|
||||||
|
|
||||||
|
skip_clone: true
|
||||||
|
|
||||||
|
pipeline:
|
||||||
|
publish:
|
||||||
|
pull: true
|
||||||
|
image: alpine
|
||||||
|
commands:
|
||||||
|
- mv /http/lineage-$version-*-UNOFFICIAL-$device.zip* /publish/$version/$device/
|
||||||
|
- cat /http/changelog-$device-$version.md >> /publish/$version/$device/changelog.md
|
||||||
|
- rm -f /http/changelog-$device-$version.md
|
||||||
|
- ls -lh /publish/$version/$device/
|
||||||
|
volumes:
|
||||||
|
- *http_vol
|
||||||
|
- *pub_vol
|
||||||
|
when:
|
||||||
|
event:
|
||||||
|
- deployment
|
32
.woodpecker/.sync.yml
Normal file
32
.woodpecker/.sync.yml
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
variables:
|
||||||
|
- &build_vol '/media/fast/lineage/lineage-20.0:/build'
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- device: mondrian
|
||||||
|
version: 20.0
|
||||||
|
|
||||||
|
pipeline:
|
||||||
|
sync:
|
||||||
|
pull: true
|
||||||
|
image: docker.nyyu.dev/lineage/android
|
||||||
|
commands:
|
||||||
|
- HOME=/home/drone
|
||||||
|
- git config --global user.email 'drone@nyyu.dev'
|
||||||
|
- git config --global user.name 'drone'
|
||||||
|
- cd /build
|
||||||
|
- rm -rf .repo/repo
|
||||||
|
- rm -f .repo/local_manifests/roomservice.xml
|
||||||
|
- repo init -u https://github.com/LineageOS-UL/android.git -b lineage-$version -g default,-darwin --git-lfs
|
||||||
|
- mkdir -p .repo/local_manifests
|
||||||
|
- cp -f $CI_WORKSPACE/$device.xml .repo/local_manifests/roomservice.xml
|
||||||
|
- repo forall -c 'git reset --hard --quiet' || true
|
||||||
|
- bash $CI_WORKSPACE/sync.sh
|
||||||
|
environment:
|
||||||
|
version: '20.0'
|
||||||
|
volumes:
|
||||||
|
- *build_vol
|
||||||
|
when:
|
||||||
|
event:
|
||||||
|
- manual
|
||||||
|
- cron
|
41
changelog.sh
Executable file
41
changelog.sh
Executable file
|
@ -0,0 +1,41 @@
|
||||||
|
#!/bin/bash -e
|
||||||
|
# shellcheck disable=SC2154,SC2207,SC2016,SC2086,SC2250,SC2312,SC2162
|
||||||
|
|
||||||
|
TOPDIR=$(pwd)
|
||||||
|
|
||||||
|
changelog=${TOPDIR}/changelog-${device}-${version}.md
|
||||||
|
|
||||||
|
declare -A before
|
||||||
|
if [[ -f gitstate-${device}-${version}.txt ]]
|
||||||
|
then
|
||||||
|
read -a tmp < gitstate-${device}-${version}.txt
|
||||||
|
else
|
||||||
|
tmp=($(repo forall -c 'echo "${REPO_PATH}:$(git rev-parse --short HEAD)"'))
|
||||||
|
fi
|
||||||
|
for i in "${tmp[@]}"; do
|
||||||
|
IFS=: read -r folder commit <<<"${i}"
|
||||||
|
before[${folder}]=${commit}
|
||||||
|
done
|
||||||
|
|
||||||
|
echo -e "# Build $(date '+%Y-%m-%d %H:%M:%S %Z')\n" >>"${changelog}"
|
||||||
|
|
||||||
|
tmp=($(repo forall -c 'echo "${REPO_PATH}:$(git rev-parse --short HEAD)"'))
|
||||||
|
|
||||||
|
for i in "${tmp[@]}"; do
|
||||||
|
IFS=: read -r folder commit <<<"${i}"
|
||||||
|
if [[ "${folder}" != lineage/* && "${before[${folder}]}" != "${commit}" ]]; then
|
||||||
|
cd "${folder}" || continue
|
||||||
|
log=$(git --no-pager log --pretty=format:"- %s" "${before[${folder}]}".."${commit}" | grep -v XXXHIDEXXX)
|
||||||
|
if [[ $(echo -n "$log" | wc -c) != 0 ]]; then
|
||||||
|
{
|
||||||
|
echo "## ${folder} ${before[${folder}]}..${commit}"
|
||||||
|
echo "$log"
|
||||||
|
echo
|
||||||
|
} >>"${changelog}"
|
||||||
|
fi
|
||||||
|
cd "${TOPDIR}" || continue
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
cat "${changelog}"
|
||||||
|
|
||||||
|
echo "${tmp[@]}" > gitstate-${device}-${version}.txt
|
|
@ -1,7 +1,7 @@
|
||||||
From 50173432aab792769a56d2a7d451d1a65e831532 Mon Sep 17 00:00:00 2001
|
From 50173432aab792769a56d2a7d451d1a65e831532 Mon Sep 17 00:00:00 2001
|
||||||
From: nyyu <mail@nyyu.dev>
|
From: nyyu <mail@nyyu.dev>
|
||||||
Date: Sun, 25 Dec 2022 22:35:09 +0100
|
Date: Sun, 25 Dec 2022 22:35:09 +0100
|
||||||
Subject: [PATCH] NetworkStats: disable BPF
|
Subject: [PATCH] XXXHIDEXXX NetworkStats: disable BPF
|
||||||
|
|
||||||
---
|
---
|
||||||
.../native/libs/libnetworkstats/BpfNetworkStats.cpp | 10 +++++-----
|
.../native/libs/libnetworkstats/BpfNetworkStats.cpp | 10 +++++-----
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 1b45884632a10093d455eb6aa09ebda35a0919f0 Mon Sep 17 00:00:00 2001
|
From 1b45884632a10093d455eb6aa09ebda35a0919f0 Mon Sep 17 00:00:00 2001
|
||||||
From: nyyu <mail@nyyu.dev>
|
From: nyyu <mail@nyyu.dev>
|
||||||
Date: Sun, 18 Sep 2022 11:44:26 +0200
|
Date: Sun, 18 Sep 2022 11:44:26 +0200
|
||||||
Subject: [PATCH] fix: always enable taskbar toggle
|
Subject: [PATCH] XXXHIDEXXX fix: always enable taskbar toggle
|
||||||
|
|
||||||
Change-Id: I247db667bec92fabcdbe7bd84946e79bae7e0bb6
|
Change-Id: I247db667bec92fabcdbe7bd84946e79bae7e0bb6
|
||||||
---
|
---
|
||||||
|
|
|
@ -1,54 +0,0 @@
|
||||||
From 56c318bf3cc9208c772c7e6d01e88380d2155c67 Mon Sep 17 00:00:00 2001
|
|
||||||
From: "tzu-hsien.huang" <tzu-hsien.huang@mediatek.com>
|
|
||||||
Date: Fri, 26 Aug 2022 11:22:03 +0200
|
|
||||||
Subject: [PATCH] Additionally check le_set_event_mask command resturn status
|
|
||||||
with UNSUPPORTED_LMP_OR_LL_PARAMETER
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
In GD BT stack, stack will check each return status of HCI Commands. E.g. reset , le_set_event_mask, set_event_mask …etc.
|
|
||||||
In BT spec 5.2, SIG add some parameters for le_set_event_mask for le audio, like LE Terminate BIG Complete event: Supported.
|
|
||||||
However, some legacy chips do not support LE Audio feature, and controller will return Status: Unsupported LMP Parameter Value when it receives this HCI Command
|
|
||||||
When it checks the return value and find the status is not SUCCESS, it will cause FAIL and cannot be compatible with old legacy chip.
|
|
||||||
After brushing GSI, Bluetooth will turn off automatically when it is turned on.
|
|
||||||
So all CTS test will always fail.
|
|
||||||
|
|
||||||
Check le_set_event_mask command return status with SUCCESS or UNSUPPORTED_LMP_OR_LL_PARAMETER
|
|
||||||
|
|
||||||
Bug: 239662211
|
|
||||||
Test: CtsBluetoothTestCases
|
|
||||||
Change-Id: I2b0cede7f47eecd2124a386e958773289eb6f11c
|
|
||||||
---
|
|
||||||
system/gd/hci/controller.cc | 11 ++++++++++-
|
|
||||||
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/system/gd/hci/controller.cc b/system/gd/hci/controller.cc
|
|
||||||
index da5986fcb7..8be21a20a3 100644
|
|
||||||
--- a/system/gd/hci/controller.cc
|
|
||||||
+++ b/system/gd/hci/controller.cc
|
|
||||||
@@ -540,7 +540,7 @@ struct Controller::impl {
|
|
||||||
void le_set_event_mask(uint64_t le_event_mask) {
|
|
||||||
std::unique_ptr<LeSetEventMaskBuilder> packet = LeSetEventMaskBuilder::Create(le_event_mask);
|
|
||||||
hci_->EnqueueCommand(std::move(packet), module_.GetHandler()->BindOnceOn(
|
|
||||||
- this, &Controller::impl::check_status<LeSetEventMaskCompleteView>));
|
|
||||||
+ this, &Controller::impl::check_event_mask_status<LeSetEventMaskCompleteView>));
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class T>
|
|
||||||
@@ -551,6 +551,15 @@ struct Controller::impl {
|
|
||||||
ASSERT(status_view.GetStatus() == ErrorCode::SUCCESS);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ template <class T>
|
|
||||||
+ void check_event_mask_status(CommandCompleteView view) {
|
|
||||||
+ ASSERT(view.IsValid());
|
|
||||||
+ auto status_view = T::Create(view);
|
|
||||||
+ ASSERT(status_view.IsValid());
|
|
||||||
+ ASSERT(status_view.GetStatus() == ErrorCode::SUCCESS ||
|
|
||||||
+ status_view.GetStatus() == ErrorCode::UNSUPPORTED_LMP_OR_LL_PARAMETER);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
#define OP_CODE_MAPPING(name) \
|
|
||||||
case OpCode::name: { \
|
|
||||||
uint16_t index = (uint16_t)OpCodeIndex::name; \
|
|
|
@ -1,40 +0,0 @@
|
||||||
From bf9a555f96cceb9ce49344e5055c2afa479df21d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Cai <peter@typeblog.net>
|
|
||||||
Date: Fri, 26 Aug 2022 11:23:30 +0200
|
|
||||||
Subject: [PATCH] gd: hci: Ignore unexpected status events
|
|
||||||
|
|
||||||
For some reason, on some old devices, the controller will report a
|
|
||||||
remote to support SNIFF_SUBRATING even when it does not. Just ignore the
|
|
||||||
error here (the status event comes from the failure response).
|
|
||||||
|
|
||||||
Change-Id: Ifb9a65fd77f21d15a8dc1ced9240194d38218ef6
|
|
||||||
---
|
|
||||||
system/gd/hci/hci_layer.cc | 15 +++++++--------
|
|
||||||
1 file changed, 7 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/system/gd/hci/hci_layer.cc b/system/gd/hci/hci_layer.cc
|
|
||||||
index 57d7e55fff..b5a9d065be 100644
|
|
||||||
--- a/system/gd/hci/hci_layer.cc
|
|
||||||
+++ b/system/gd/hci/hci_layer.cc
|
|
||||||
@@ -195,14 +195,13 @@ struct HciLayer::impl {
|
|
||||||
EventView::Create(PacketView<kLittleEndian>(std::make_shared<std::vector<uint8_t>>(std::vector<uint8_t>()))));
|
|
||||||
command_queue_.front().GetCallback<CommandCompleteView>()->Invoke(move(command_complete_view));
|
|
||||||
} else {
|
|
||||||
- ASSERT_LOG(
|
|
||||||
- command_queue_.front().waiting_for_status_ == is_status,
|
|
||||||
- "0x%02hx (%s) was not expecting %s event",
|
|
||||||
- op_code,
|
|
||||||
- OpCodeText(op_code).c_str(),
|
|
||||||
- logging_id.c_str());
|
|
||||||
-
|
|
||||||
- command_queue_.front().GetCallback<TResponse>()->Invoke(move(response_view));
|
|
||||||
+ if (command_queue_.front().waiting_for_status_ == is_status) {
|
|
||||||
+ command_queue_.front().GetCallback<TResponse>()->Invoke(move(response_view));
|
|
||||||
+ } else {
|
|
||||||
+ CommandCompleteView command_complete_view = CommandCompleteView::Create(
|
|
||||||
+ EventView::Create(PacketView<kLittleEndian>(std::make_shared<std::vector<uint8_t>>(std::vector<uint8_t>()))));
|
|
||||||
+ command_queue_.front().GetCallback<CommandCompleteView>()->Invoke(move(command_complete_view));
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
command_queue_.pop_front();
|
|
|
@ -1,33 +0,0 @@
|
||||||
From 6c794ea2b4247a3359453cb178cfd0f8e2d38f56 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sugakesshaa <83747297+bheatleyyy@users.noreply.github.com>
|
|
||||||
Date: Fri, 9 Sep 2022 03:35:26 +0800
|
|
||||||
Subject: [PATCH] Nuke condition check for controller
|
|
||||||
|
|
||||||
---
|
|
||||||
system/gd/hci/controller.cc | 13 +++----------
|
|
||||||
1 file changed, 3 insertions(+), 10 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/system/gd/hci/controller.cc b/system/gd/hci/controller.cc
|
|
||||||
index 8be21a20a3..dbece21c6e 100644
|
|
||||||
--- a/system/gd/hci/controller.cc
|
|
||||||
+++ b/system/gd/hci/controller.cc
|
|
||||||
@@ -66,16 +66,9 @@ struct Controller::impl {
|
|
||||||
|
|
||||||
hci_->EnqueueCommand(ReadBufferSizeBuilder::Create(),
|
|
||||||
handler->BindOnceOn(this, &Controller::impl::read_buffer_size_complete_handler));
|
|
||||||
-
|
|
||||||
- if (is_supported(OpCode::LE_READ_BUFFER_SIZE_V2)) {
|
|
||||||
- hci_->EnqueueCommand(
|
|
||||||
- LeReadBufferSizeV2Builder::Create(),
|
|
||||||
- handler->BindOnceOn(this, &Controller::impl::le_read_buffer_size_v2_handler));
|
|
||||||
- } else {
|
|
||||||
- hci_->EnqueueCommand(
|
|
||||||
- LeReadBufferSizeV1Builder::Create(),
|
|
||||||
- handler->BindOnceOn(this, &Controller::impl::le_read_buffer_size_handler));
|
|
||||||
- }
|
|
||||||
+
|
|
||||||
+ hci_->EnqueueCommand(LeReadBufferSizeV1Builder::Create(),
|
|
||||||
+ handler->BindOnceOn(this, &Controller::impl::le_read_buffer_size_handler));
|
|
||||||
|
|
||||||
hci_->EnqueueCommand(
|
|
||||||
LeReadFilterAcceptListSizeBuilder::Create(),
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 6ad0718fa87dfbaa2bd95ab23f60f485a896e84b Mon Sep 17 00:00:00 2001
|
From 6ad0718fa87dfbaa2bd95ab23f60f485a896e84b Mon Sep 17 00:00:00 2001
|
||||||
From: nyyu <mail@nyyu.dev>
|
From: nyyu <mail@nyyu.dev>
|
||||||
Date: Fri, 30 Sep 2022 22:40:43 +0200
|
Date: Fri, 30 Sep 2022 22:40:43 +0200
|
||||||
Subject: [PATCH] bt: disable le
|
Subject: [PATCH] XXXHIDEXXX bt: disable le
|
||||||
|
|
||||||
Change-Id: I5c258b1401fcd6fbfa98c98849db209688f52d3c
|
Change-Id: I5c258b1401fcd6fbfa98c98849db209688f52d3c
|
||||||
---
|
---
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 74d6bf5b114dfe94ca84e94d111d191ae5155a8e Mon Sep 17 00:00:00 2001
|
From 74d6bf5b114dfe94ca84e94d111d191ae5155a8e Mon Sep 17 00:00:00 2001
|
||||||
From: nyyu <mail@nyyu.dev>
|
From: nyyu <mail@nyyu.dev>
|
||||||
Date: Sat, 10 Dec 2022 10:46:10 +0100
|
Date: Sat, 10 Dec 2022 10:46:10 +0100
|
||||||
Subject: [PATCH] fix: enable more grids for tablet
|
Subject: [PATCH] XXXHIDEXXX fix: enable more grids for tablet
|
||||||
|
|
||||||
Change-Id: I18c617760f5ad94d0baca06865525d7e73ee45ca
|
Change-Id: I18c617760f5ad94d0baca06865525d7e73ee45ca
|
||||||
---
|
---
|
||||||
|
@ -14,7 +14,7 @@ index 8105afaa24..eef99d49bb 100644
|
||||||
+++ b/res/xml/device_profiles.xml
|
+++ b/res/xml/device_profiles.xml
|
||||||
@@ -103,7 +103,7 @@
|
@@ -103,7 +103,7 @@
|
||||||
launcher:dbFile="launcher_4_by_5.db"
|
launcher:dbFile="launcher_4_by_5.db"
|
||||||
launcher:inlineNavButtonsEndSpacing="@dimen/taskbar_button_margin_4_5"
|
launcher:inlineNavButtonsEndSpacing="@dimen/taskbar_button_margin_split"
|
||||||
launcher:defaultLayoutId="@xml/default_workspace_4x5"
|
launcher:defaultLayoutId="@xml/default_workspace_4x5"
|
||||||
- launcher:deviceCategory="phone|multi_display" >
|
- launcher:deviceCategory="phone|multi_display" >
|
||||||
+ launcher:deviceCategory="phone|tablet|multi_display" >
|
+ launcher:deviceCategory="phone|tablet|multi_display" >
|
||||||
|
@ -23,7 +23,7 @@ index 8105afaa24..eef99d49bb 100644
|
||||||
launcher:name="Short Stubby"
|
launcher:name="Short Stubby"
|
||||||
@@ -167,7 +167,7 @@
|
@@ -167,7 +167,7 @@
|
||||||
launcher:dbFile="launcher.db"
|
launcher:dbFile="launcher.db"
|
||||||
launcher:inlineNavButtonsEndSpacing="@dimen/taskbar_button_margin_5_5"
|
launcher:inlineNavButtonsEndSpacing="@dimen/taskbar_button_margin_split"
|
||||||
launcher:defaultLayoutId="@xml/default_workspace_5x5"
|
launcher:defaultLayoutId="@xml/default_workspace_5x5"
|
||||||
- launcher:deviceCategory="phone|multi_display" >
|
- launcher:deviceCategory="phone|multi_display" >
|
||||||
+ launcher:deviceCategory="phone|tablet|multi_display" >
|
+ launcher:deviceCategory="phone|tablet|multi_display" >
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From d2022bc573e304388ec55b8f2ba710e8d960c18b Mon Sep 17 00:00:00 2001
|
From d2022bc573e304388ec55b8f2ba710e8d960c18b Mon Sep 17 00:00:00 2001
|
||||||
From: nyyu <mail@nyyu.dev>
|
From: nyyu <mail@nyyu.dev>
|
||||||
Date: Sun, 4 Dec 2022 10:25:36 +0100
|
Date: Sun, 4 Dec 2022 10:25:36 +0100
|
||||||
Subject: [PATCH] fix: rear camera rotation
|
Subject: [PATCH] XXXHIDEXXX fix: rear camera rotation
|
||||||
|
|
||||||
---
|
---
|
||||||
camera/CameraUtils.cpp | 2 +-
|
camera/CameraUtils.cpp | 2 +-
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 497ae885d6a92d473ec3c603bd39e4510380240d Mon Sep 17 00:00:00 2001
|
From 497ae885d6a92d473ec3c603bd39e4510380240d Mon Sep 17 00:00:00 2001
|
||||||
From: nyyu <mail@nyyu.dev>
|
From: nyyu <mail@nyyu.dev>
|
||||||
Date: Sat, 7 Jan 2023 10:54:05 +0100
|
Date: Sat, 7 Jan 2023 10:54:05 +0100
|
||||||
Subject: [PATCH] releasetools: Store the build.prop file in the OTA zip
|
Subject: [PATCH] XXXHIDEXXX releasetools: Store the build.prop file in the OTA zip
|
||||||
|
|
||||||
Change-Id: I81825a8a4633dff294a372ccf4de8e3aef99750c
|
Change-Id: I81825a8a4633dff294a372ccf4de8e3aef99750c
|
||||||
---
|
---
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 6fde482e5b5d0dd0adc7617c334f0bb0c0482c7d Mon Sep 17 00:00:00 2001
|
From 6fde482e5b5d0dd0adc7617c334f0bb0c0482c7d Mon Sep 17 00:00:00 2001
|
||||||
From: nyyu <mail@nyyu.dev>
|
From: nyyu <mail@nyyu.dev>
|
||||||
Date: Fri, 23 Dec 2022 19:20:55 +0100
|
Date: Fri, 23 Dec 2022 19:20:55 +0100
|
||||||
Subject: [PATCH] fix: trebuchet taskbar
|
Subject: [PATCH] XXXHIDEXXX fix: trebuchet taskbar
|
||||||
|
|
||||||
Change-Id: I566e6a3cf799cdd8ee5d4f07221b9d6bb80d41cb
|
Change-Id: I566e6a3cf799cdd8ee5d4f07221b9d6bb80d41cb
|
||||||
---
|
---
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 437d7b1ee54df480d212ca97ddc3b8acd2944966 Mon Sep 17 00:00:00 2001
|
From 437d7b1ee54df480d212ca97ddc3b8acd2944966 Mon Sep 17 00:00:00 2001
|
||||||
From: maxwen <max.weninger@gmail.com>
|
From: maxwen <max.weninger@gmail.com>
|
||||||
Date: Tue, 25 Sep 2018 09:44:26 +0200
|
Date: Tue, 25 Sep 2018 09:44:26 +0200
|
||||||
Subject: [PATCH] base: use better solution for MicroG FAKE_PACKAGE_SIGNATURE
|
Subject: [PATCH] XXXHIDEXXX base: use better solution for MicroG FAKE_PACKAGE_SIGNATURE
|
||||||
|
|
||||||
make it a privileged permission instead of a runtime one
|
make it a privileged permission instead of a runtime one
|
||||||
to add extra safety dont trust the signature coming from the
|
to add extra safety dont trust the signature coming from the
|
||||||
|
|
|
@ -2,13 +2,12 @@
|
||||||
<manifest>
|
<manifest>
|
||||||
<remote name="nyyu" fetch="https://git.nyyu.dev" />
|
<remote name="nyyu" fetch="https://git.nyyu.dev" />
|
||||||
<project name="lineage/android_device_samsung_mondrianwifi" path="device/samsung/mondrianwifi" remote="nyyu" revision="lineage-20" />
|
<project name="lineage/android_device_samsung_mondrianwifi" path="device/samsung/mondrianwifi" remote="nyyu" revision="lineage-20" />
|
||||||
|
<project name="lineage/android_device_samsung_mondrianlte" path="device/samsung/mondrianlte" remote="nyyu" revision="lineage-20" />
|
||||||
<project name="lineage/android_kernel_samsung_msm8974" path="kernel/samsung/msm8974_tab" remote="nyyu" revision="lineage-20_pro" />
|
<project name="lineage/android_kernel_samsung_msm8974" path="kernel/samsung/msm8974_tab" remote="nyyu" revision="lineage-20_pro" />
|
||||||
<project name="lineage/android_vendor_samsung_mondrianwifi" path="vendor/samsung/mondrianwifi" remote="nyyu" revision="lineage-20" />
|
<project name="lineage/android_vendor_samsung_mondrianwifi" path="vendor/samsung/mondrianwifi" remote="nyyu" revision="lineage-20" />
|
||||||
|
<project name="lineage/android_vendor_samsung_mondrianlte" path="vendor/samsung/mondrianlte" remote="nyyu" revision="lineage-20" />
|
||||||
<project name="lineage/android_device_samsung_msm8974-common" path="device/samsung/msm8974-common" remote="nyyu" revision="lineage-20" />
|
<project name="lineage/android_device_samsung_msm8974-common" path="device/samsung/msm8974-common" remote="nyyu" revision="lineage-20" />
|
||||||
<project name="LineageOS/android_device_samsung_qcom-common" path="device/samsung/qcom-common" remote="github" revision="lineage-20" />
|
<project name="LineageOS/android_device_samsung_qcom-common" path="device/samsung/qcom-common" remote="github" revision="lineage-20" />
|
||||||
<project name="LineageOS/android_hardware_samsung" path="hardware/samsung" remote="github" revision="lineage-20" />
|
<project name="LineageOS/android_hardware_samsung" path="hardware/samsung" remote="github" revision="lineage-20" />
|
||||||
<project name="LineageOS-UL/android_hardware_sony_timekeep" path="hardware/sony/timekeep" remote="losul" />
|
<project name="lineage/proprietary_vendor_samsung" path="vendor/samsung" remote="nyyu" revision="lineage-20" />
|
||||||
<project name="TheMuppets/proprietary_vendor_samsung" path="vendor/samsung" remote="github" revision="lineage-18.1" />
|
</manifest>
|
||||||
|
|
||||||
<remove-project name="platform/prebuilts/clang/host/darwin-x86" />
|
|
||||||
</manifest>
|
|
|
@ -1,7 +1,7 @@
|
||||||
From c9a37a5a5a9e63fda74f6fcf45bc9f164957f295 Mon Sep 17 00:00:00 2001
|
From c9a37a5a5a9e63fda74f6fcf45bc9f164957f295 Mon Sep 17 00:00:00 2001
|
||||||
From: Danny Lin <danny@kdrag0n.dev>
|
From: Danny Lin <danny@kdrag0n.dev>
|
||||||
Date: Wed, 7 Oct 2020 00:24:54 -0700
|
Date: Wed, 7 Oct 2020 00:24:54 -0700
|
||||||
Subject: [PATCH] init: Set properties to make SafetyNet pass
|
Subject: [PATCH] XXXHIDEXXX init: Set properties to make SafetyNet pass
|
||||||
|
|
||||||
Google's SafetyNet integrity checks will check the values of these
|
Google's SafetyNet integrity checks will check the values of these
|
||||||
properties when performing basic attestation. Setting fake values helps
|
properties when performing basic attestation. Setting fake values helps
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 3db46053ca0547c175fa591075a67b8d76c4b906 Mon Sep 17 00:00:00 2001
|
From 3db46053ca0547c175fa591075a67b8d76c4b906 Mon Sep 17 00:00:00 2001
|
||||||
From: Danny Lin <danny@kdrag0n.dev>
|
From: Danny Lin <danny@kdrag0n.dev>
|
||||||
Date: Mon, 11 Oct 2021 19:59:51 -0700
|
Date: Mon, 11 Oct 2021 19:59:51 -0700
|
||||||
Subject: [PATCH] Alter model name to avoid SafetyNet HW attestation
|
Subject: [PATCH] XXXHIDEXXX Alter model name to avoid SafetyNet HW attestation
|
||||||
enforcement
|
enforcement
|
||||||
|
|
||||||
As of September 2, Google is enforcing SafetyNet's previously
|
As of September 2, Google is enforcing SafetyNet's previously
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From ae57183500bb34032ec426fcae2b9a14e028ce12 Mon Sep 17 00:00:00 2001
|
From ae57183500bb34032ec426fcae2b9a14e028ce12 Mon Sep 17 00:00:00 2001
|
||||||
From: Danny Lin <danny@kdrag0n.dev>
|
From: Danny Lin <danny@kdrag0n.dev>
|
||||||
Date: Mon, 11 Oct 2021 20:00:44 -0700
|
Date: Mon, 11 Oct 2021 20:00:44 -0700
|
||||||
Subject: [PATCH] keystore: Block key attestation for SafetyNet
|
Subject: [PATCH] XXXHIDEXXX keystore: Block key attestation for SafetyNet
|
||||||
|
|
||||||
SafetyNet (part of Google Play Services) opportunistically uses
|
SafetyNet (part of Google Play Services) opportunistically uses
|
||||||
hardware-backed key attestation via KeyStore as a strong integrity
|
hardware-backed key attestation via KeyStore as a strong integrity
|
||||||
|
|
48
sync.sh
Normal file → Executable file
48
sync.sh
Normal file → Executable file
|
@ -1,54 +1,18 @@
|
||||||
#!/bin/bash -e
|
#!/bin/bash -e
|
||||||
# shellcheck disable=SC2250,SC2154,SC2086,SC1091,SC2312
|
# shellcheck disable=SC2250,SC2154,SC2086,SC2207,SC2016
|
||||||
|
|
||||||
if [[ -z "$CI_WORKSPACE" ]]; then
|
|
||||||
CI_WORKSPACE=$DRONE_WORKSPACE_BASE
|
|
||||||
fi
|
|
||||||
|
|
||||||
TOPDIR=$(pwd)
|
TOPDIR=$(pwd)
|
||||||
changelog=${TOPDIR}/changelog-${device}-${version}.md
|
|
||||||
|
|
||||||
declare -A before
|
repo sync -q -c -j 6 --fail-fast --force-sync --no-tags || repo sync -q -c -j 6 --fail-fast --force-sync --no-tags || exit 1
|
||||||
tmp=($(repo forall -c 'echo "${REPO_PATH}:$(git rev-parse --short HEAD)"'))
|
|
||||||
for i in "${tmp[@]}"; do
|
|
||||||
IFS=: read -r folder commit <<<"${i}"
|
|
||||||
before[${folder}]=${commit}
|
|
||||||
done
|
|
||||||
|
|
||||||
repo sync -q -c -j 6 --fail-fast --force-sync --no-tags
|
|
||||||
|
|
||||||
echo -e "# Build $(date '+%Y-%m-%d %H:%M:%S') UTC\n" >>"${changelog}"
|
|
||||||
|
|
||||||
tmp=($(repo forall -c 'echo "${REPO_PATH}:$(git rev-parse --short HEAD)"'))
|
|
||||||
for i in "${tmp[@]}"; do
|
|
||||||
IFS=: read -r folder commit <<<"${i}"
|
|
||||||
if [[ "${folder}" != lineage/* && "${before[${folder}]}" != "${commit}" ]]; then
|
|
||||||
cd "${folder}" || continue
|
|
||||||
log=$(git --no-pager log --pretty=format:"- %s" "${before[${folder}]}".."${commit}")
|
|
||||||
if [[ $(echo -n "$log" | wc -c) != 0 ]]; then
|
|
||||||
{
|
|
||||||
echo "## ${folder} ${before[${folder}]}..${commit}"
|
|
||||||
echo "$log"
|
|
||||||
echo
|
|
||||||
} >>"${changelog}"
|
|
||||||
fi
|
|
||||||
cd "${TOPDIR}" || continue
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
echo -e "\n" >>"${changelog}"
|
|
||||||
cat "${changelog}"
|
|
||||||
|
|
||||||
cd build/tools
|
cd build/tools
|
||||||
git am $CI_WORKSPACE/fix-store-build-prop-zip.patch || git am --abort
|
git am $CI_WORKSPACE/fix-store-build-prop-zip.patch || git am --abort
|
||||||
cd $TOPDIR
|
cd $TOPDIR
|
||||||
|
|
||||||
cd system/vold
|
|
||||||
git am $CI_WORKSPACE/vold-add-option-metadata_csum.patch || git am --abort
|
|
||||||
cd $TOPDIR
|
|
||||||
|
|
||||||
cd packages/apps/LineageParts
|
cd packages/apps/LineageParts
|
||||||
git am $CI_WORKSPACE/fix-always-enable-taskbar-toggle.patch || git am --abort
|
git am $CI_WORKSPACE/fix-always-enable-taskbar-toggle.patch || git am --abort
|
||||||
cd $TOPDIR
|
cd $TOPDIR
|
||||||
|
|
||||||
cd packages/apps/Trebuchet
|
cd packages/apps/Trebuchet
|
||||||
git am $CI_WORKSPACE/fix-enable-more-grids-for-tablet.patch || git am --abort
|
git am $CI_WORKSPACE/fix-enable-more-grids-for-tablet.patch || git am --abort
|
||||||
git am $CI_WORKSPACE/fix-trebuchet-taskbar.patch || git am --abort
|
git am $CI_WORKSPACE/fix-trebuchet-taskbar.patch || git am --abort
|
||||||
|
@ -56,9 +20,6 @@ cd $TOPDIR
|
||||||
|
|
||||||
#bluetooth
|
#bluetooth
|
||||||
cd packages/modules/Bluetooth
|
cd packages/modules/Bluetooth
|
||||||
git am $CI_WORKSPACE/fix-bt-1.patch || git am --abort
|
|
||||||
git am $CI_WORKSPACE/fix-bt-2.patch || git am --abort
|
|
||||||
git am $CI_WORKSPACE/fix-bt-3.patch || git am --abort
|
|
||||||
git am $CI_WORKSPACE/fix-bt-le.patch || git am --abort
|
git am $CI_WORKSPACE/fix-bt-le.patch || git am --abort
|
||||||
cd $TOPDIR
|
cd $TOPDIR
|
||||||
|
|
||||||
|
@ -84,5 +45,8 @@ git am $CI_WORKSPACE/snet20-3.patch || git am --abort
|
||||||
git am $CI_WORKSPACE/microg.patch || git am --abort
|
git am $CI_WORKSPACE/microg.patch || git am --abort
|
||||||
cd $TOPDIR
|
cd $TOPDIR
|
||||||
|
|
||||||
|
cd hardware/qcom-caf/wlan
|
||||||
|
git reset --hard e0f934b
|
||||||
|
cd $TOPDIR
|
||||||
#. build/envsetup.sh
|
#. build/envsetup.sh
|
||||||
#repopick
|
#repopick
|
||||||
|
|
|
@ -1,53 +0,0 @@
|
||||||
From 133c414b6df0654ae2d38f44240d0c3a74c851e6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: nyyu <mail@nyyu.dev>
|
|
||||||
Date: Sun, 8 Jan 2023 11:37:40 +0100
|
|
||||||
Subject: [PATCH] vold: add option ^metadata_csum
|
|
||||||
|
|
||||||
Change-Id: I1fe379967968e4be8973e98c4fcb9b5c95bb60e8
|
|
||||||
---
|
|
||||||
Utils.cpp | 2 +-
|
|
||||||
fs/Ext4.cpp | 7 +++++--
|
|
||||||
2 files changed, 6 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Utils.cpp b/Utils.cpp
|
|
||||||
index a7e85f2..9ffc1dd 100644
|
|
||||||
--- a/Utils.cpp
|
|
||||||
+++ b/Utils.cpp
|
|
||||||
@@ -644,7 +644,7 @@ static status_t readMetadata(const std::string& path, std::string* fsType, std::
|
|
||||||
cmd.push_back(path);
|
|
||||||
|
|
||||||
std::vector<std::string> output;
|
|
||||||
- status_t res = ForkExecvp(cmd, &output, untrusted ? sBlkidUntrustedContext : sBlkidContext);
|
|
||||||
+ status_t res = ForkExecvp(cmd, &output/*, untrusted ? sBlkidUntrustedContext : sBlkidContext*/);
|
|
||||||
if (res != OK) {
|
|
||||||
LOG(WARNING) << "blkid failed to identify " << path;
|
|
||||||
return res;
|
|
||||||
diff --git a/fs/Ext4.cpp b/fs/Ext4.cpp
|
|
||||||
index 0ae5cb3..73971e1 100644
|
|
||||||
--- a/fs/Ext4.cpp
|
|
||||||
+++ b/fs/Ext4.cpp
|
|
||||||
@@ -184,19 +184,22 @@ status_t Format(const std::string& source, unsigned long numSectors, const std::
|
|
||||||
cmd.push_back("-t");
|
|
||||||
cmd.push_back("ext4");
|
|
||||||
|
|
||||||
+ cmd.push_back("-m");
|
|
||||||
+ cmd.push_back("0");
|
|
||||||
+
|
|
||||||
cmd.push_back("-M");
|
|
||||||
cmd.push_back(target);
|
|
||||||
|
|
||||||
bool needs_casefold =
|
|
||||||
android::base::GetBoolProperty("external_storage.casefold.enabled", false);
|
|
||||||
- bool needs_projid = true;
|
|
||||||
+ bool needs_projid = false;
|
|
||||||
|
|
||||||
if (needs_projid) {
|
|
||||||
cmd.push_back("-I");
|
|
||||||
cmd.push_back("512");
|
|
||||||
}
|
|
||||||
|
|
||||||
- std::string options("has_journal");
|
|
||||||
+ std::string options("has_journal,^metadata_csum");
|
|
||||||
if (android::base::GetBoolProperty("vold.has_quota", false)) {
|
|
||||||
options += ",quota";
|
|
||||||
}
|
|
Loading…
Add table
Reference in a new issue