From 223005db8cf7b402c7fc68038cd0df3ca17e09f1 Mon Sep 17 00:00:00 2001 From: maoyue730 Date: Wed, 3 Sep 2025 14:39:39 +0800 Subject: [PATCH] 1. fix the problem of home/back/app-switch button; 2. fix the network problem when start cloudphone based on a copied data image --- .../mesa3d/external-mesa3d-0001.patch | 2 +- .../base/frameworks-base-0002.patch | 37 ++++++++++++------- .../system/core/system-core-0001.patch | 11 +++--- 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/patchForAndroid15/external/mesa3d/external-mesa3d-0001.patch b/patchForAndroid15/external/mesa3d/external-mesa3d-0001.patch index e4b2c69..2c8202d 100644 --- a/patchForAndroid15/external/mesa3d/external-mesa3d-0001.patch +++ b/patchForAndroid15/external/mesa3d/external-mesa3d-0001.patch @@ -291,7 +291,7 @@ index 00000000000..5e080ac1474 + $($(M_TARGET_PREFIX)MESA3D_LIBGLAPI_BIN) \ + +MESON_GEN_NINJA := \ -+ cd $(MESON_OUT_DIR) && PATH=/usr/bin:/usr/local/bin:$$PATH meson.py ./build \ ++ cd $(MESON_OUT_DIR) && PATH=/usr/bin:/usr/local/bin:$$PATH meson15.py ./build \ + --cross-file $(call relative-to-absolute,$(MESON_GEN_DIR))/aosp_cross \ + --buildtype=release \ + -Dgbm-backends-path=/vendor/$(MESA3D_LIB_DIR)/dri \ diff --git a/patchForAndroid15/frameworks/base/frameworks-base-0002.patch b/patchForAndroid15/frameworks/base/frameworks-base-0002.patch index b5c188f..3f51383 100644 --- a/patchForAndroid15/frameworks/base/frameworks-base-0002.patch +++ b/patchForAndroid15/frameworks/base/frameworks-base-0002.patch @@ -1,13 +1,27 @@ -From 885f3df683cfa621d0ec74e2a7a9066a89403203 Mon Sep 17 00:00:00 2001 -From: root -Date: Sat, 19 Jul 2025 09:42:37 +0800 -Subject: [PATCH] gps mock - -Change-Id: I8440bbd2b68a988c81fd1677a057264a7e5c10c0 ---- - services/core/jni/gnss/Gnss.cpp | 183 ++------------------------------ - 1 file changed, 7 insertions(+), 176 deletions(-) - +diff --git a/data/keyboards/Generic.kl b/data/keyboards/Generic.kl +index f8d3bffbe00b..b547c8bd72e8 100644 +--- a/data/keyboards/Generic.kl ++++ b/data/keyboards/Generic.kl +@@ -22,8 +22,8 @@ + + key 1 ESCAPE + key 2 1 +-key 3 2 +-key 4 3 ++key 3 HOME ++key 4 BACK + key 5 4 + key 6 5 + key 7 6 +@@ -206,7 +206,7 @@ key 180 NUMPAD_RIGHT_PAREN + # key 184 F14 + # key 185 F15 + # key 186 F16 +-# key 187 F17 ++key 187 APP_SWITCH + # key 188 F18 + # key 189 F19 + # key 190 F20 diff --git a/services/core/jni/gnss/Gnss.cpp b/services/core/jni/gnss/Gnss.cpp index da8928b5f97f..bf62044c68e6 100644 --- a/services/core/jni/gnss/Gnss.cpp @@ -349,6 +363,3 @@ index da8928b5f97f..bf62044c68e6 100644 auto gnssAntennaInfo_V2_1 = gnssHal_V2_1->getExtensionGnssAntennaInfo(); if (checkHidlReturn(gnssAntennaInfo_V2_1, "Unable to get a handle to GnssAntennaInfo_V2_1")) { --- -2.33.0 - diff --git a/patchForAndroid15/system/core/system-core-0001.patch b/patchForAndroid15/system/core/system-core-0001.patch index e3b8ec7..810ce45 100644 --- a/patchForAndroid15/system/core/system-core-0001.patch +++ b/patchForAndroid15/system/core/system-core-0001.patch @@ -292,10 +292,10 @@ index 000000000..12c3a1af9 +bool writePackedUInt32(uint32_t value, FILE *stream); diff --git a/init/ipconfigstore/main.cc b/init/ipconfigstore/main.cc new file mode 100644 -index 000000000..ef4a2a5ae +index 000000000..ecbc0ea18 --- /dev/null +++ b/init/ipconfigstore/main.cc -@@ -0,0 +1,165 @@ +@@ -0,0 +1,166 @@ +#include +#include +#include @@ -413,8 +413,8 @@ index 000000000..ef4a2a5ae + } +} + -+static int write_conf(struct ipconfig *conf, uint32_t v) { -+ FILE *fp = fopen("/data/misc/ethernet/ipconfig.txt", "w+"); ++static int write_conf(char *file_path, struct ipconfig *conf, uint32_t v) { ++ FILE *fp = fopen(file_path, "w+"); + + writePackedUInt32(v, fp); // version + @@ -457,7 +457,8 @@ index 000000000..ef4a2a5ae + struct ipconfig conf; + get_conf(&conf); + printf("ipconfig: ipv4: %s, mask: %i, gateway: %s", conf.ipv4, conf.mask, conf.gateway); -+ write_conf(&conf, v); ++ write_conf((char *)"/data/misc/ethernet/ipconfig.txt", &conf, v); ++ write_conf((char *)"/data/misc/apexdata/com.android.tethering/misc/ethernet/ipconfig.txt", &conf, v); + return 0; +} + -- Gitee