Add back the CNE and DPM blobs + churn

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2022-09-30 12:22:54 -04:00
parent 598d78bb61
commit da2e44c5f3
No known key found for this signature in database
GPG key ID: B286E9F57A07424B
5 changed files with 10 additions and 10 deletions

View file

@ -12,10 +12,10 @@ Change-Id: I74b0b8a5aa70f0794b4f3d72c70167dbe2aae88d
1 file changed, 11 insertions(+)
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 0a85854b2af8..236dd19e0982 100644
index 7d70b6d73497..07918a9a903b 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -182,6 +182,7 @@ import android.content.pm.IPackageManager;
@@ -185,6 +185,7 @@ import android.content.pm.IPackageManager;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
@ -23,7 +23,7 @@ index 0a85854b2af8..236dd19e0982 100644
import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.database.ContentObserver;
@@ -282,6 +283,7 @@ import com.android.server.LocalServices;
@@ -285,6 +286,7 @@ import com.android.server.LocalServices;
import com.android.server.ServiceThread;
import com.android.server.SystemConfig;
import com.android.server.connectivity.MultipathPolicyTracker;
@ -31,7 +31,7 @@ index 0a85854b2af8..236dd19e0982 100644
import com.android.server.usage.AppStandbyInternal;
import com.android.server.usage.AppStandbyInternal.AppIdleStateChangeListener;
@@ -797,6 +799,15 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
@@ -802,6 +804,15 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
public void bindConnectivityManager() {
mConnManager = Objects.requireNonNull(mContext.getSystemService(ConnectivityManager.class),
"missing ConnectivityManager");

View file

@ -81,10 +81,10 @@ index 12e29e693b..b6745806b5 100644
android:id="@+id/private_dns_mode_opportunistic"
layout="@layout/preference_widget_dialog_radiobutton"/>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 2e727640c2..8728212e7d 100644
index a5354ef8bc..b7c9a4b6b4 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -78,6 +78,21 @@
@@ -81,6 +81,21 @@
<!-- Volume link notification -->
<string name="volume_link_notification_title">Link ring &amp; notification volumes</string>