Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService."

Browse Source 
am: 7211131e23

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

Change-Id: Ifd70b0232fba8d1c8fe2e87b2ca95985d3c0681c
This commit is contained in:
songjinshi
2016-06-03 21:32:03 +00:00
committed by android-build-merger
parent 9eb774054e 7211131e23
commit b9d266ff9b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -2326,9 +2326,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
final String[] packages = mContext.getPackageManager().getPackagesForUid(uid);
final int userId = UserHandle.getUserId(uid);
for (String packageName : packages) {
if (!mUsageStats.isAppIdle(packageName, uid, userId)) {
return false;
if (packages != null) {
for (String packageName : packages) {
if (!mUsageStats.isAppIdle(packageName, uid, userId)) {
return false;
}
}
}
return true;