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

Commit d5475db1 authored by Patrick Rohr's avatar Patrick Rohr Committed by Automerger Merge Worker
Browse files

Add Restricted Mode settings observer to NetworkPolicyManagerService am: 8b6082b5 am: f2832ba4 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e00cf86a40356d373e56375eec78679cd06b191
parents c4ad2045 f2832ba4

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

+40 −4
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.UserInfo;

import android.content.res.Resources;

import android.database.ContentObserver;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager.NetworkCallback;

import android.net.IConnectivityManager;
@@ -609,6 +610,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
    @GuardedBy("mUidRulesFirstLock")

    private final SparseBooleanArray mInternetPermissionMap = new SparseBooleanArray();



    private RestrictedModeObserver mRestrictedModeObserver;



    // TODO: keep allowlist of system-critical services that should never have

    // rules enforced, such as system, phone, and radio UIDs.
@@ -622,6 +625,34 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        int COUNT = IS_UID_NETWORKING_BLOCKED + 1;

    }



    private static class RestrictedModeObserver extends ContentObserver {

        private final Context mContext;

        private final RestrictedModeListener mListener;



        RestrictedModeObserver(Context ctx, RestrictedModeListener listener) {

            super(null);

            mContext = ctx;

            mListener = listener;

            mContext.getContentResolver().registerContentObserver(

                    Settings.Global.getUriFor(Settings.Global.RESTRICTED_NETWORKING_MODE), false,

                    this);

        }



        public boolean isRestrictedModeEnabled() {

            return Settings.Global.getInt(mContext.getContentResolver(),

                    Settings.Global.RESTRICTED_NETWORKING_MODE, 0) != 0;

        }



        @Override

        public void onChange(boolean selfChange) {

            mListener.onChange(isRestrictedModeEnabled());

        }



        public interface RestrictedModeListener {

            void onChange(boolean enabled);

        }

    }



    public final StatLogger mStatLogger = new StatLogger(new String[]{

            "updateNetworkEnabledNL()",

            "isUidNetworkingBlocked()",
@@ -797,9 +828,14 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
                    mRestrictPower = mPowerManagerInternal.getLowPowerState(

                            ServiceType.NETWORK_FIREWALL).batterySaverEnabled;



                    mRestrictedNetworkingMode = Settings.Global.getInt(

                            mContext.getContentResolver(),

                            Settings.Global.RESTRICTED_NETWORKING_MODE, 0) != 0;

                    mRestrictedModeObserver = new RestrictedModeObserver(mContext,

                            enabled -> {

                                synchronized (mUidRulesFirstLock) {

                                    mRestrictedNetworkingMode = enabled;

                                    updateRestrictedModeAllowlistUL();

                                }

                            });

                    mRestrictedNetworkingMode = mRestrictedModeObserver.isRestrictedModeEnabled();



                    mSystemReady = true;