Commit fd47dd17 authored Jun 07, 2016 by Xin Li Committed by android-build-merger Jun 07, 2016

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

Merge "Merge "resolve merge conflicts of b9d266ff to nyc-dev-plus-aosp" into nyc-dev-plus-aosp am: e61d3ff3" into nyc-mr1-dev-plus-aosp
am: c06eedb3

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

Change-Id: I81299a35f280c98782c00a0774352f4b0e005e4d

parents c86d1acf c06eedb3

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;