commit 2217cd03f4d44609d6929e2d0f304b79f45c0021
author Chiachang Wang <chiachangwang@google.com> Mon Dec 05 00:48:25 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 05 00:48:25 2022 +0000
tree 75ee1eb87a1b6257f0b7c76efc8f7d8728984f04
parent 80ca8e0f8f998116ff3b754b0f4ed79a9b8b5c1b
parent 18a6e8cf2f871a47a5cfd46124b5e4f1fc0ac696

Merge "Ensure calling package and UID synchronized while calling dump()"

service/src/com/android/server/ConnectivityService.java

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index 316f9e5..4c9e3a3 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -250,6 +250,7 @@
 import com.android.modules.utils.BasicShellCommandHandler;
 import com.android.modules.utils.build.SdkLevel;
 import com.android.net.module.util.BaseNetdUnsolicitedEventListener;
+import com.android.net.module.util.BinderUtils;
 import com.android.net.module.util.BitUtils;
 import com.android.net.module.util.CollectionUtils;
 import com.android.net.module.util.DeviceConfigUtils;
@@ -5161,7 +5162,9 @@
             description = settingValue + " (?)";
         }
         pw.println("Avoid bad wifi setting:        " + description);
-        final Boolean configValue = mMultinetworkPolicyTracker.deviceConfigActivelyPreferBadWifi();
+
+        final Boolean configValue = BinderUtils.withCleanCallingIdentity(
+                () -> mMultinetworkPolicyTracker.deviceConfigActivelyPreferBadWifi());
         if (null == configValue) {
             description = "unset";
         } else if (configValue) {