44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
|
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
|
||
|
|
|