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

Commit 1a0bc037 authored by Xin Li's avatar Xin Li Committed by android-build-merger
Browse files

Merge "resolve merge conflicts of b9d266ff to nyc-dev-plus-aosp" into nyc-dev-plus-aosp 

am: e61d3ff3

* commit 'e61d3ff3':
  Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService.

Change-Id: Ia6f1c88bba68df6660d7e91e4bedebda22bcf5c5
parents 5e674dea e61d3ff3

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;