commit 7826c2f43e0ddadf2a731807ff1a813bfc073c4e
author Shuo Qian <shuoq@google.com> Tue Jan 21 20:10:11 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 21 20:10:11 2020 +0000
tree 88b481b6533050141e023346596017887d077d38
parent e50c61c8ba640b2b0370338d594f3e2c925e2c68
parent 04d8936f82f7416b96cf0690b9b6c49b0d2604b5

Merge "Resolve the hidden SubscriptionManager API usage in  NetworkPolicyManagerService in Mainline"

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index c60fed0..9760185 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -169,6 +169,7 @@
 import android.os.Binder;
 import android.os.Environment;
 import android.os.Handler;
+import android.os.HandlerExecutor;
 import android.os.HandlerThread;
 import android.os.IDeviceIdleController;
 import android.os.INetworkManagementService;
@@ -876,7 +877,8 @@
 
             // Listen for subscriber changes
             mContext.getSystemService(SubscriptionManager.class).addOnSubscriptionsChangedListener(
-                    new OnSubscriptionsChangedListener(mHandler.getLooper()) {
+                    new HandlerExecutor(mHandler),
+                    new OnSubscriptionsChangedListener() {
                         @Override
                         public void onSubscriptionsChanged() {
                             updateNetworksInternal();