Merge "resolve merge conflicts of b9d266f to nyc-dev-plus-aosp" into nyc-dev-plus-aosp (e61d3ff3) · Commits · e / os / android_frameworks_base

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;