commit 330798dd584cedbe659f6b6d7bf4d58b172be4f0
author Paul Hu <paulhu@google.com> Thu Jan 21 07:53:19 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 21 07:53:19 2021 +0000
tree 8be8ee5b6e30e0055ec2d2e792af78f17d3169c1
parent aa8c3fd4b14f6e9a4453f9aaa14076e302c6ca84
parent 54fdd61d0ca2e887b62c4a822bbdb44fe2d43a2a

Merge "Replace Context @hide API in MultinetworkPolicyTracker"

core/java/android/net/util/MultinetworkPolicyTracker.java

diff --git a/core/java/android/net/util/MultinetworkPolicyTracker.java b/core/java/android/net/util/MultinetworkPolicyTracker.java
index 8dfd4e1..85e3fa3 100644
--- a/core/java/android/net/util/MultinetworkPolicyTracker.java
+++ b/core/java/android/net/util/MultinetworkPolicyTracker.java
@@ -29,7 +29,6 @@
 import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.Handler;
-import android.os.UserHandle;
 import android.provider.Settings;
 import android.telephony.PhoneStateListener;
 import android.telephony.SubscriptionManager;
@@ -114,8 +113,8 @@
 
         final IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);
-        mContext.registerReceiverAsUser(
-                mBroadcastReceiver, UserHandle.ALL, intentFilter, null, mHandler);
+        mContext.registerReceiverForAllUsers(mBroadcastReceiver, intentFilter,
+                null /* broadcastPermission */, mHandler);
 
         reevaluate();
     }