Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df28bddb authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Replace Context @hide API in MultinetworkPolicyTracker" am: e8bf3e90... 

Merge "Replace Context @hide API in MultinetworkPolicyTracker" am: e8bf3e90 am: 465b565d am: 892fa611

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf4d66456d3b3675d16a80b1538949c3807ddcbc
parents 23f1ac80 892fa611

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@ import android.content.res.Resources; 
import android.database.ContentObserver;

import android.database.ContentObserver;

import android.net.Uri;

import android.net.Uri;

import android.os.Handler;

import android.os.Handler;

import android.os.UserHandle;

import android.provider.Settings;

import android.provider.Settings;

import android.telephony.PhoneStateListener;

import android.telephony.PhoneStateListener;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager;
@@ -114,8 +113,8 @@ public class MultinetworkPolicyTracker { 




        final IntentFilter intentFilter = new IntentFilter();

        final IntentFilter intentFilter = new IntentFilter();

        intentFilter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);

        intentFilter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);

        mContext.registerReceiverAsUser(

        mContext.registerReceiverForAllUsers(mBroadcastReceiver, intentFilter,

                mBroadcastReceiver, UserHandle.ALL, intentFilter, null, mHandler);

                null /* broadcastPermission */, mHandler);





        reevaluate();

        reevaluate();

    }

    }