android-9.0.0_r61 patches
This commit is contained in:
46
android-9.0.0_r61/frameworks/base/0001-fix-booting.patch
Normal file
46
android-9.0.0_r61/frameworks/base/0001-fix-booting.patch
Normal file
@@ -0,0 +1,46 @@
|
||||
From c651d427ac02015e992cd30e41b0a5705c513b3a Mon Sep 17 00:00:00 2001
|
||||
From: Ziyang Zhou <ziyang.zhou@outlook.com>
|
||||
Date: Sun, 9 May 2021 22:04:12 +0800
|
||||
Subject: [PATCH 1/2] fix booting
|
||||
|
||||
---
|
||||
core/jni/android_os_VintfObject.cpp | 1 +
|
||||
.../com/android/server/net/NetworkPolicyManagerService.java | 3 ++-
|
||||
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/core/jni/android_os_VintfObject.cpp b/core/jni/android_os_VintfObject.cpp
|
||||
index e8ef349f..58e13292 100644
|
||||
--- a/core/jni/android_os_VintfObject.cpp
|
||||
+++ b/core/jni/android_os_VintfObject.cpp
|
||||
@@ -97,6 +97,7 @@ static jobjectArray android_os_VintfObject_report(JNIEnv* env, jclass)
|
||||
}
|
||||
|
||||
static jint verify(JNIEnv* env, jobjectArray packageInfo, android::vintf::DisabledChecks checks) {
|
||||
+ if (env) return 0; // HACKED NO sepolicy
|
||||
std::vector<std::string> cPackageInfo;
|
||||
if (packageInfo) {
|
||||
size_t count = env->GetArrayLength(packageInfo);
|
||||
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
|
||||
index ab482bb2..ae3012d6 100644
|
||||
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
|
||||
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
|
||||
@@ -712,6 +712,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
|
||||
Process.setThreadPriority(Process.THREAD_PRIORITY_FOREGROUND);
|
||||
if (!isBandwidthControlEnabled()) {
|
||||
Slog.w(TAG, "bandwidth controls disabled, unable to enforce policy");
|
||||
+ initCompleteSignal.countDown(); // HACKED
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -3856,7 +3857,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
|
||||
|
||||
if (packages != null) {
|
||||
for (String packageName : packages) {
|
||||
- if (!mUsageStats.isAppIdle(packageName, uid, userId)) {
|
||||
+ if (mUsageStats != null && !mUsageStats.isAppIdle(packageName, uid, userId)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
--
|
||||
2.34.1
|
||||
|
||||
37
android-9.0.0_r61/frameworks/base/0002-fix-networking.patch
Normal file
37
android-9.0.0_r61/frameworks/base/0002-fix-networking.patch
Normal file
@@ -0,0 +1,37 @@
|
||||
From eabc5f138894eec1234e336ff5ba9d51618d4d71 Mon Sep 17 00:00:00 2001
|
||||
From: Ziyang Zhou <ziyang.zhou@outlook.com>
|
||||
Date: Sun, 9 May 2021 22:29:50 +0800
|
||||
Subject: [PATCH 2/2] fix networking
|
||||
|
||||
---
|
||||
core/java/android/net/ConnectivityManager.java | 1 +
|
||||
.../java/com/android/server/connectivity/NetworkMonitor.java | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
|
||||
index c5cb1f5b..df564509 100644
|
||||
--- a/core/java/android/net/ConnectivityManager.java
|
||||
+++ b/core/java/android/net/ConnectivityManager.java
|
||||
@@ -1044,6 +1044,7 @@ public class ConnectivityManager {
|
||||
@RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
|
||||
public NetworkInfo getNetworkInfo(int networkType) {
|
||||
try {
|
||||
+ if (networkType == ConnectivityManager.TYPE_WIFI) networkType = ConnectivityManager.TYPE_ETHERNET;
|
||||
return mService.getNetworkInfo(networkType);
|
||||
} catch (RemoteException e) {
|
||||
throw e.rethrowFromSystemServer();
|
||||
diff --git a/services/core/java/com/android/server/connectivity/NetworkMonitor.java b/services/core/java/com/android/server/connectivity/NetworkMonitor.java
|
||||
index 208fb105..3c478f95 100644
|
||||
--- a/services/core/java/com/android/server/connectivity/NetworkMonitor.java
|
||||
+++ b/services/core/java/com/android/server/connectivity/NetworkMonitor.java
|
||||
@@ -1083,6 +1083,7 @@ public class NetworkMonitor extends StateMachine {
|
||||
@VisibleForTesting
|
||||
protected CaptivePortalProbeResult sendHttpProbe(URL url, int probeType,
|
||||
@Nullable CaptivePortalProbeSpec probeSpec) {
|
||||
+ if (url != null) return new CaptivePortalProbeResult(CaptivePortalProbeResult.SUCCESS_CODE);
|
||||
HttpURLConnection urlConnection = null;
|
||||
int httpResponseCode = CaptivePortalProbeResult.FAILED_CODE;
|
||||
String redirectUrl = null;
|
||||
--
|
||||
2.34.1
|
||||
|
||||
Reference in New Issue
Block a user