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

Commit e91f7dee authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update NPMS to listen for all uid procstate changes." am: dfc3abdf 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5596793757dff3d5e49a6b0c42b0935550f47abe
parents 6da7e8ca dfc3abdf

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

+2 −1
Original line number Diff line number Diff line
@@ -883,9 +883,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 


            mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class);

            try {

                // TODO: There shouldn't be a need to receive callback for all changes.

                mActivityManager.registerUidObserver(mUidObserver,

                        ActivityManager.UID_OBSERVER_PROCSTATE|ActivityManager.UID_OBSERVER_GONE,

                        NetworkPolicyManager.FOREGROUND_THRESHOLD_STATE, "android");

                        ActivityManager.PROCESS_STATE_UNKNOWN, "android");

                mNetworkManager.registerObserver(mAlertObserver);

            } catch (RemoteException e) {

                // ignored; both services live in system_server

services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java

+1 −3
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ import android.net.LinkProperties; 
import android.net.Network;

import android.net.NetworkCapabilities;

import android.net.NetworkPolicy;

import android.net.NetworkPolicyManager;

import android.net.NetworkState;

import android.net.NetworkStats;

import android.net.NetworkStatsHistory;
@@ -386,8 +385,7 @@ public class NetworkPolicyManagerServiceTest { 
                Log.d(TAG, "set mUidObserver to " + mUidObserver);

                return null;

            }

        }).when(mActivityManager).registerUidObserver(any(), anyInt(),

                eq(NetworkPolicyManager.FOREGROUND_THRESHOLD_STATE), any(String.class));

        }).when(mActivityManager).registerUidObserver(any(), anyInt(), anyInt(), any(String.class));



        mFutureIntent = newRestrictBackgroundChangedFuture();

        mService = new NetworkPolicyManagerService(mServiceContext, mActivityManager,