commit 19b7fb054c1750d4b66cabd38b76f3947cd176f4
author Xin Li <delphij@google.com> Mon Aug 13 13:01:08 2018 -0700
committer Xin Li <delphij@google.com> Mon Aug 13 13:01:08 2018 -0700
tree 1db33ba5ce22714ead3e6269e9cebc2037c0b10e
parent e6d745c6f8f795f91333b7edae3b1323fa85590e
parent f89a482aee93227abf2b019e3f4118f8c248c572

Merge stage-dr1-aosp-master into stage-aosp-master

Bug: 112535855
Change-Id: I1ba00379ca307f44a6430e516b474983e4c1dd32

core/java/android/net/NetworkAgent.java

diff --git a/core/java/android/net/NetworkAgent.java b/core/java/android/net/NetworkAgent.java
index 081d8d1..e6b3fa8 100644
--- a/core/java/android/net/NetworkAgent.java
+++ b/core/java/android/net/NetworkAgent.java
@@ -387,7 +387,7 @@
      * {@link #saveAcceptUnvalidated} to respect the user's choice.
      */
     public void explicitlySelected(boolean acceptUnvalidated) {
-        queueOrSendMessage(EVENT_SET_EXPLICITLY_SELECTED, acceptUnvalidated);
+        queueOrSendMessage(EVENT_SET_EXPLICITLY_SELECTED, acceptUnvalidated ? 1 : 0, 0);
     }
 
     /**

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 914404b..ba5f323 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -2202,7 +2202,7 @@
                         loge("ERROR: already-connected network explicitly selected.");
                     }
                     nai.networkMisc.explicitlySelected = true;
-                    nai.networkMisc.acceptUnvalidated = (boolean) msg.obj;
+                    nai.networkMisc.acceptUnvalidated = msg.arg1 == 1;
                     break;
                 }
                 case NetworkAgent.EVENT_PACKET_KEEPALIVE: {