From 563dc032aa55e16bf5ad08e4574c22c57106c3ee Mon Sep 17 00:00:00 2001
From: nyyu <mail@nyyu.dev>
Date: Sat, 26 Nov 2022 19:49:14 +0100
Subject: [PATCH] fix: clean

---
 fix-uninstall-app-crash.patch | 43 -----------------------------------
 mondrianwifi.xml              |  3 ---
 sync.sh                       | 16 +++----------
 3 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 fix-uninstall-app-crash.patch

diff --git a/fix-uninstall-app-crash.patch b/fix-uninstall-app-crash.patch
deleted file mode 100644
index a5d98a4..0000000
--- a/fix-uninstall-app-crash.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From eaf05803660d9f8f3e49c9d91d875494cfee1216 Mon Sep 17 00:00:00 2001
-From: nyyu <mail@nyyu.dev>
-Date: Mon, 10 Oct 2022 22:36:33 +0200
-Subject: [PATCH] fix: uninstall app crash
-
----
- service-t/src/com/android/server/net/NetworkStatsService.java | 3 +++
- service/src/com/android/server/BpfNetMaps.java                | 4 ++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/service-t/src/com/android/server/net/NetworkStatsService.java b/service-t/src/com/android/server/net/NetworkStatsService.java
-index 4f0f3411a..a11ffbd89 100644
---- a/service-t/src/com/android/server/net/NetworkStatsService.java
-+++ b/service-t/src/com/android/server/net/NetworkStatsService.java
-@@ -2421,6 +2421,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
-      * @param uid
-      */
-     private void deleteKernelTagData(int uid) {
-+        if (mCookieTagMap == null)
-+            return;
-+
-         try {
-             mCookieTagMap.forEach((key, value) -> {
-                 // If SkDestroyListener deletes the socket tag while this code is running,
-diff --git a/service/src/com/android/server/BpfNetMaps.java b/service/src/com/android/server/BpfNetMaps.java
-index c006bc605..3d1fc9b71 100644
---- a/service/src/com/android/server/BpfNetMaps.java
-+++ b/service/src/com/android/server/BpfNetMaps.java
-@@ -67,9 +67,9 @@ public class BpfNetMaps {
-     }
- 
-     private void maybeThrow(final int err, final String msg) {
--        if (err != 0) {
-+        /*if (err != 0) {
-             throw new ServiceSpecificException(err, msg + ": " + Os.strerror(err));
--        }
-+        }*/
-     }
- 
-     /**
--- 
-2.38.0
-
diff --git a/mondrianwifi.xml b/mondrianwifi.xml
index 31c22db..6f2ce60 100644
--- a/mondrianwifi.xml
+++ b/mondrianwifi.xml
@@ -11,7 +11,4 @@
   <project name="TheMuppets/proprietary_vendor_samsung" path="vendor/samsung" remote="github" revision="lineage-18.1" />
 
   <remove-project name="platform/prebuilts/clang/host/darwin-x86" />
-  <remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_aarch64_aarch64-linux-android-4.9" />
-  <remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_arm_arm-linux-androideabi-4.9" />
-  <remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_x86_x86_64-linux-android-4.9" />
 </manifest>
\ No newline at end of file
diff --git a/sync.sh b/sync.sh
index 30163b6..4cfa5c8 100644
--- a/sync.sh
+++ b/sync.sh
@@ -1,7 +1,6 @@
 #!/bin/bash -e
 # shellcheck disable=SC2250,SC2154,SC2086,SC1091,SC2312
 
-. build/envsetup.sh
 
 TOPDIR=$(pwd)
 changelog=${TOPDIR}/changelog-${device}-${version}.md
@@ -36,6 +35,8 @@ done
 echo -e "\n" >>"${changelog}"
 cat "${changelog}"
 
+. build/envsetup.sh
+
 cd packages/apps/LineageParts
 git am $DRONE_WORKSPACE_BASE/fix-always-enable-taskbar-toggle.patch || git am --abort
 cd $TOPDIR
@@ -65,17 +66,6 @@ git am $DRONE_WORKSPACE_BASE/fix-bt-3.patch || git am --abort
 git am $DRONE_WORKSPACE_BASE/fix-bt-le.patch || git am --abort
 cd $TOPDIR
 
-cd packages/modules/Connectivity
-git am $DRONE_WORKSPACE_BASE/fix-uninstall-app-crash.patch || git am --abort
-cd $TOPDIR
-
-#cd hardware/interfaces
-#git reset --hard ad2871f7
-#cd $TOPDIR
-
 #safetynet
 repopick -f 334348 -P system/core
-repopick -f 334343 334344 -P frameworks/base
-
-#health
-repopick -f 338895
\ No newline at end of file
+repopick -f 334343 334344 -P frameworks/base
\ No newline at end of file