commit 57ca4b27431d76bee06f39760290dab1d40fd9b5
author Treehugger Robot <treehugger-gerrit@google.com> Sat Mar 02 05:38:21 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 02 05:38:21 2019 +0000
tree bf97546f94247b0873c055f93acd60f172023258
parent 72a6706e8be7b8185566547f05cdf2872b54abdf
parent bb6bacc130073be13cccc7aa5907bd17c17073ab

Merge "Ensure handleUpdateLinkProperties runs on the CS handler thread."

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 90281b7..cc3e6fb 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -5565,6 +5565,8 @@
     }
 
     public void handleUpdateLinkProperties(NetworkAgentInfo nai, LinkProperties newLp) {
+        ensureRunningOnConnectivityServiceThread();
+
         if (getNetworkAgentInfoForNetId(nai.network.netId) != nai) {
             // Ignore updates for disconnected networks
             return;