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

Change-Id: I1580d3c108d1f0b57f75b27d67e229f8b314a72a
2016-06-06 10:48:59 -07:00
parent 52821051d2 b9d266ff9b
commit 4cb2741230
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -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;