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

Commit 27887837 authored by Austin Borger's avatar Austin Borger Committed by Automerger Merge Worker
Browse files

Merge "NetworkPolicyManagerService: Use the default UidObserver... 

Merge "NetworkPolicyManagerService: Use the default UidObserver implementation." into udc-dev am: bc758f94

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



Change-Id: Ic7edfcd0144071169e3cbeaa56ec283d3a8f2d26
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aa012d9d bc758f94

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

+2 −13
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ import android.app.IUidObserver; 
import android.app.Notification;

import android.app.NotificationManager;

import android.app.PendingIntent;

import android.app.UidObserver;

import android.app.usage.NetworkStats;

import android.app.usage.NetworkStatsManager;

import android.app.usage.UsageStatsManagerInternal;
@@ -1117,7 +1118,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        }

    }



    final private IUidObserver mUidObserver = new IUidObserver.Stub() {

    final private IUidObserver mUidObserver = new UidObserver() {

        @Override public void onUidStateChanged(int uid, int procState, long procStateSeq,

                @ProcessCapability int capability) {

            synchronized (mUidStateCallbackInfos) {
@@ -1139,18 +1140,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        @Override public void onUidGone(int uid, boolean disabled) {

            mUidEventHandler.obtainMessage(UID_MSG_GONE, uid, 0).sendToTarget();

        }



        @Override public void onUidActive(int uid) {

        }



        @Override public void onUidIdle(int uid, boolean disabled) {

        }



        @Override public void onUidCachedChanged(int uid, boolean cached) {

        }



        @Override public void onUidProcAdjChanged(int uid) {

        }

    };



    private static final class UidStateCallbackInfo {