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

Commit 0d6ab7bd authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in streamin policy getters."

parents 6ccb18f3 a3807493

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+8 −12
Original line number Original line Diff line number Diff line
@@ -7960,13 +7960,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        Preconditions.checkCallAuthorization(hasCrossUsersPermission(caller, userId));

        Preconditions.checkCallAuthorization(hasCrossUsersPermission(caller, userId));

















        synchronized (getLockObject()) {







        synchronized (getLockObject()) {











            if (mOwners.hasProfileOwner(userId) || mOwners.hasDeviceOwner()) {














            final ActiveAdmin admin = getDeviceOrProfileOwnerAdminLocked(userId);







            final ActiveAdmin admin = getDeviceOrProfileOwnerAdminLocked(userId);











                return admin.mNearbyNotificationStreamingPolicy;







            return admin != null











            }







                    ? admin.mNearbyNotificationStreamingPolicy














                    : NEARBY_STREAMING_NOT_CONTROLLED_BY_POLICY;











        }







        }
























        return NEARBY_STREAMING_NOT_CONTROLLED_BY_POLICY;














    }







    }



























    @Override







    @Override










@@ -8001,13 +7999,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {









        Preconditions.checkCallAuthorization(hasCrossUsersPermission(caller, userId));







        Preconditions.checkCallAuthorization(hasCrossUsersPermission(caller, userId));



























        synchronized (getLockObject()) {







        synchronized (getLockObject()) {











            if (mOwners.hasProfileOwner(userId) || mOwners.hasDeviceOwner()) {














            final ActiveAdmin admin = getDeviceOrProfileOwnerAdminLocked(userId);







            final ActiveAdmin admin = getDeviceOrProfileOwnerAdminLocked(userId);











                return admin.mNearbyAppStreamingPolicy;







            return admin != null











            }







                    ? admin.mNearbyAppStreamingPolicy














                    : NEARBY_STREAMING_NOT_CONTROLLED_BY_POLICY;











        }







        }
























        return NEARBY_STREAMING_NOT_CONTROLLED_BY_POLICY;














    }







    }



























    /**







    /**