LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix potential NPE on devices without DPMS

Browse Source 
Bug: 20563108
Change-Id: Ie2bda65c834ddad9db8753f7616c2754072551cd
This commit is contained in:
Zoltan Szatmary-Ban
2015-04-30 10:38:24 +01:00
parent bbed6c22f2
commit 3a0699a153
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 int callingUid = Binder.getCallingUid();
final DevicePolicyManagerInternal dpmi = LocalServices.getService( final DevicePolicyManagerInternal dpmi = LocalServices.getService(
DevicePolicyManagerInternal.class); DevicePolicyManagerInternal.class);
if (dpmi.isActiveAdminWithPolicy(callingUid, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER)
|| dpmi.isActiveAdminWithPolicy(callingUid, // Device owners are also profile owners so it is enough to check for that.
DeviceAdminInfo.USES_POLICY_DEVICE_OWNER)) { if (dpmi != null && dpmi.isActiveAdminWithPolicy(callingUid,
DeviceAdminInfo.USES_POLICY_PROFILE_OWNER)) {
return; return;
} }
} }