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

Merge "Fix potential NPE on devices without DPMS" into mnc-dev

Browse Source
This commit is contained in:
Zoltan Szatmary-Ban
2015-04-30 09:48:34 +00:00
committed by Android (Google) Code Review
parent dc4ad271f9 cccbe885b9
commit 780a9b9e12
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/net/NetworkStatsService.java
View File

@@ -561,9 +561,10 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
final int callingUid = Binder.getCallingUid();
final DevicePolicyManagerInternal dpmi = LocalServices.getService(
DevicePolicyManagerInternal.class);
if (dpmi.isActiveAdminWithPolicy(callingUid, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER)
|| dpmi.isActiveAdminWithPolicy(callingUid,
DeviceAdminInfo.USES_POLICY_DEVICE_OWNER)) {
// Device owners are also profile owners so it is enough to check for that.
if (dpmi != null && dpmi.isActiveAdminWithPolicy(callingUid,
DeviceAdminInfo.USES_POLICY_PROFILE_OWNER)) {
return;
}
}