From 24e3388080ed2ec254197a0ed965dd5f9e6af526 Mon Sep 17 00:00:00 2001 From: paulhu Date: Tue, 19 Jan 2021 14:45:35 +0800 Subject: Replace Context @hide API in MultinetworkPolicyTracker MultinetworkPolicyTracker is part of Connectivity mainline module which cannot call @hide API Context#registerReceiverAsUser. Thus, replace it to Context#registerReceiverForAllUsers. Bug: 170634463 Test: atest FrameworksNetTests Test: Manully check that receiving intent and unregistering receiver can work normally. Change-Id: Ie22a3aa40bc9243082672a64dba7c7940f9ff21a --- core/java/android/net/util/MultinetworkPolicyTracker.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/java/android/net/util/MultinetworkPolicyTracker.java b/core/java/android/net/util/MultinetworkPolicyTracker.java index 8dfd4e182ec4..85e3fa3048ed 100644 --- a/core/java/android/net/util/MultinetworkPolicyTracker.java +++ b/core/java/android/net/util/MultinetworkPolicyTracker.java @@ -29,7 +29,6 @@ import android.content.res.Resources; 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 @@ public class MultinetworkPolicyTracker { 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(); } -- cgit v1.2.3-59-g8ed1b