Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-02-13 10:19:14 -05:00
parent 29ef757ac6
commit 742a2fb7e2
No known key found for this signature in database
GPG key ID: B286E9F57A07424B
11 changed files with 18 additions and 42 deletions

View file

@ -10,10 +10,10 @@ requiring the READ_PHONE_STATE permission.
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index df5113b16f49..eeec22f2ae7f 100644
index 968ff933ed74..fc01e0757d43 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -4816,12 +4816,7 @@ public class ActivityManagerService extends IActivityManager.Stub
@@ -4819,12 +4819,7 @@ public class ActivityManagerService extends IActivityManager.Stub
ProfilerInfo profilerInfo = mAppProfiler.setupProfilerInfoLocked(thread, app, instr);

View file

@ -38,10 +38,10 @@ Such ops are being constructed due to another bug.
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index e31c952e10f9..db51cbdb525e 100644
index 20f0c17bb9d9..748ff6bc0d0d 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -5197,15 +5197,13 @@ public class AppOpsService extends IAppOpsService.Stub {
@@ -5193,15 +5193,13 @@ public class AppOpsService extends IAppOpsService.Stub {
String lastPkg = null;
for (int i=0; i<allOps.size(); i++) {
AppOpsManager.PackageOps pkg = allOps.get(i);

View file

@ -15,10 +15,10 @@ crashes.
1 file changed, 3 insertions(+)
diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index db51cbdb525e..6bf4c3bb7742 100644
index 748ff6bc0d0d..f8feeaad0fa7 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -5197,6 +5197,9 @@ public class AppOpsService extends IAppOpsService.Stub {
@@ -5193,6 +5193,9 @@ public class AppOpsService extends IAppOpsService.Stub {
String lastPkg = null;
for (int i=0; i<allOps.size(); i++) {
AppOpsManager.PackageOps pkg = allOps.get(i);

View file

@ -31,7 +31,7 @@ Change-Id: I5926493864d4b1291ae83f8b601bf5dcc54085cd
create mode 100644 hosts_cache.h
diff --git a/Android.bp b/Android.bp
index 45425aa..e843654 100644
index 45425aa0..e843654c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -164,6 +164,7 @@ cc_library {
@ -43,7 +43,7 @@ index 45425aa..e843654 100644
"res_comp.cpp",
"res_debug.cpp",
diff --git a/getaddrinfo.cpp b/getaddrinfo.cpp
index 6674f23..d854293 100644
index 6674f238..d8542939 100644
--- a/getaddrinfo.cpp
+++ b/getaddrinfo.cpp
@@ -66,6 +66,8 @@
@ -71,7 +71,7 @@ index 6674f23..d854293 100644
cur->ai_next = p;
diff --git a/hosts_cache.cpp b/hosts_cache.cpp
new file mode 100644
index 0000000..a40fb40
index 00000000..a40fb403
--- /dev/null
+++ b/hosts_cache.cpp
@@ -0,0 +1,523 @@
@ -600,7 +600,7 @@ index 0000000..a40fb40
+}
diff --git a/hosts_cache.h b/hosts_cache.h
new file mode 100644
index 0000000..55138dc
index 00000000..55138dcb
--- /dev/null
+++ b/hosts_cache.h
@@ -0,0 +1,28 @@
@ -633,7 +633,7 @@ index 0000000..55138dc
+
+#endif
diff --git a/sethostent.cpp b/sethostent.cpp
index 7f9384c..f1bf657 100644
index 7f9384c0..f1bf6572 100644
--- a/sethostent.cpp
+++ b/sethostent.cpp
@@ -43,6 +43,8 @@

View file

@ -24,7 +24,7 @@ Change-Id: I4b0bb81699151d5b371850daebf785e35ec9b170
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/hosts_cache.cpp b/hosts_cache.cpp
index a40fb40..258eac1 100644
index a40fb403..258eac1b 100644
--- a/hosts_cache.cpp
+++ b/hosts_cache.cpp
@@ -126,7 +126,7 @@ static int cmp_hcent_name(const void *a, const void *b)

View file

@ -10,7 +10,7 @@ Change-Id: Iea165003474e1107dc77980985bf9928c369dbb5
1 file changed, 4 insertions(+)
diff --git a/getaddrinfo.cpp b/getaddrinfo.cpp
index d854293..4760f7f 100644
index d8542939..4760f7fd 100644
--- a/getaddrinfo.cpp
+++ b/getaddrinfo.cpp
@@ -57,6 +57,7 @@