Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2021-03-05 10:23:27 +00:00
committed by Gerrit Code Review
parent 0bb7932183 b5127c0713
commit dfc3abdf72
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -883,9 +883,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class); mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class);
try { try {
// TODO: There shouldn't be a need to receive callback for all changes.
mActivityManager.registerUidObserver(mUidObserver, mActivityManager.registerUidObserver(mUidObserver,
ActivityManager.UID_OBSERVER_PROCSTATE|ActivityManager.UID_OBSERVER_GONE, ActivityManager.UID_OBSERVER_PROCSTATE|ActivityManager.UID_OBSERVER_GONE,
NetworkPolicyManager.FOREGROUND_THRESHOLD_STATE, "android"); ActivityManager.PROCESS_STATE_UNKNOWN, "android");
mNetworkManager.registerObserver(mAlertObserver); mNetworkManager.registerObserver(mAlertObserver);
} catch (RemoteException e) { } catch (RemoteException e) {
// ignored; both services live in system_server // ignored; both services live in system_server

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

@@ -115,7 +115,6 @@ import android.net.LinkProperties;
import android.net.Network; import android.net.Network;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkPolicy; import android.net.NetworkPolicy;
import android.net.NetworkPolicyManager;
import android.net.NetworkState; import android.net.NetworkState;
import android.net.NetworkStats; import android.net.NetworkStats;
import android.net.NetworkStatsHistory; import android.net.NetworkStatsHistory;
@@ -386,8 +385,7 @@ public class NetworkPolicyManagerServiceTest {
Log.d(TAG, "set mUidObserver to " + mUidObserver); Log.d(TAG, "set mUidObserver to " + mUidObserver);
return null; return null;
} }
}).when(mActivityManager).registerUidObserver(any(), anyInt(), }).when(mActivityManager).registerUidObserver(any(), anyInt(), anyInt(), any(String.class));
eq(NetworkPolicyManager.FOREGROUND_THRESHOLD_STATE), any(String.class));
mFutureIntent = newRestrictBackgroundChangedFuture(); mFutureIntent = newRestrictBackgroundChangedFuture();
mService = new NetworkPolicyManagerService(mServiceContext, mActivityManager, mService = new NetworkPolicyManagerService(mServiceContext, mActivityManager,