Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2aab6de5 authored by Zoltan Szatmary-Ban's avatar Zoltan Szatmary-Ban Committed by Android Git Automerger
Browse files

am 795ec677: am 780a9b9e: Merge "Fix potential NPE on devices without DPMS" into mnc-dev 

* commit '795ec677':
  Fix potential NPE on devices without DPMS
parents f225e6c6 795ec677

services/core/java/com/android/server/net/NetworkStatsService.java

+4 −3
Original line number Diff line number Diff line
@@ -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;

            }

        }