From 04d8936f82f7416b96cf0690b9b6c49b0d2604b5 Mon Sep 17 00:00:00 2001
From: Shuo Qian <shuoq@google.com>
Date: Wed, 15 Jan 2020 11:46:49 -0800
Subject: [PATCH] Resolve the hidden SubscriptionManager API usage in 
 NetworkPolicyManagerService in Mainline

Use the public API with Executor instead.

Test: Treehugger
Bug: 147697741
Change-Id: Id4e475527c6851064f1ce9d86dc1b989590359fd
---
 .../com/android/server/net/NetworkPolicyManagerService.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 04b51a93b9943..b8209a108b8c2 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.BestClock;
 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 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
 
             // Listen for subscriber changes
             mContext.getSystemService(SubscriptionManager.class).addOnSubscriptionsChangedListener(
-                    new OnSubscriptionsChangedListener(mHandler.getLooper()) {
+                    new HandlerExecutor(mHandler),
+                    new OnSubscriptionsChangedListener() {
                         @Override
                         public void onSubscriptionsChanged() {
                             updateNetworksInternal();