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

Commit 21a8afd0 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Register NPMS$UidObserver to listen for only necessary procstate changes."

parents 5185bc79 6a3c07e2

services/core/java/com/android/server/am/ActivityManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -11941,7 +11941,9 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        printed = true;

                    }

                    pw.print("    "); UserHandle.formatUid(pw, reg.uid);

                    pw.print(" "); pw.print(reg.pkg); pw.print(":");

                    pw.print(" "); pw.print(reg.pkg);

                    final IUidObserver observer = mUidObservers.getRegisteredCallbackItem(i);

                    pw.print(" "); pw.print(observer.getClass().getTypeName()); pw.print(":");

                    if ((reg.which&ActivityManager.UID_OBSERVER_IDLE) != 0) {

                        pw.print(" IDLE");

                    }

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

+1 −1
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
            try {

                mActivityManager.registerUidObserver(mUidObserver,

                        ActivityManager.UID_OBSERVER_PROCSTATE|ActivityManager.UID_OBSERVER_GONE,

                        ActivityManager.PROCESS_STATE_UNKNOWN, null);

                        NetworkPolicyManager.FOREGROUND_THRESHOLD_STATE, "android");

                mNetworkManager.registerObserver(mAlertObserver);

            } catch (RemoteException e) {

                // ignored; both services live in system_server

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

+2 −1
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ import android.net.NetworkCapabilities; 
import android.net.NetworkInfo;

import android.net.NetworkInfo.DetailedState;

import android.net.NetworkPolicy;

import android.net.NetworkPolicyManager;

import android.net.NetworkState;

import android.net.NetworkStats;

import android.net.NetworkStatsHistory;
@@ -365,7 +366,7 @@ public class NetworkPolicyManagerServiceTest { 
                return null;

            }

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

                eq(ActivityManager.PROCESS_STATE_UNKNOWN), isNull(String.class));

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



        mFutureIntent = newRestrictBackgroundChangedFuture();

        mService = new NetworkPolicyManagerService(mServiceContext, mActivityManager,