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

Commit 4cb27412 authored by Xin Li's avatar Xin Li
Browse files

resolve merge conflicts of b9d266ff to nyc-dev-plus-aosp 

Change-Id: I1580d3c108d1f0b57f75b27d67e229f8b314a72a
parents 52821051 b9d266ff

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

+1 −1
Original line number Diff line number Diff line
@@ -2747,7 +2747,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        final String[] packages = mContext.getPackageManager().getPackagesForUid(uid);

        final int userId = UserHandle.getUserId(uid);



        if (!ArrayUtils.isEmpty(packages)) {

        if (packages != null) {

            for (String packageName : packages) {

                if (!mUsageStats.isAppIdle(packageName, uid, userId)) {

                    return false;