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

Commit cead3d32 authored by Rafael Prado's avatar Rafael Prado
Browse files

Use callerPackageName instead of caller.getPackageName() 

Test: btest TimeTest
Flag: android.app.admin.flags.set_auto_time_enabled_coexistence
Flag: android.app.admin.flags.set_auto_time_zone_enabled_coexistence
Bug: 378924355
Change-Id: Ie5d5e2bed6da83ce3509aeebb11805ce11da8149
parent 8526fd94

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

+4 −4
Original line number Diff line number Diff line
@@ -9089,7 +9089,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        CallerIdentity caller = getCallerIdentity(who);















        if (Flags.setAutoTimeEnabledCoexistence()) {













            Preconditions.checkCallAuthorization(hasPermission(SET_TIME, caller.getPackageName()));













            Preconditions.checkCallAuthorization(hasPermission(SET_TIME, callerPackageName));















        } else {















            Objects.requireNonNull(who, "ComponentName is null");















            Preconditions.checkCallAuthorization(isProfileOwnerOnUser0(caller)










@@ -9152,7 +9152,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













        EnforcingAdmin enforcingAdmin = enforcePermissionAndGetEnforcingAdmin(















                /* who */ null,















                SET_TIME,













                caller.getPackageName(),













                callerPackageName,















                UserHandle.USER_ALL















        );















        Integer state = mDevicePolicyEngine.getGlobalPolicySetByAdmin(










@@ -9197,7 +9197,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













        CallerIdentity caller = getCallerIdentity(who);















        if (Flags.setAutoTimeZoneEnabledCoexistence()) {















            Preconditions.checkCallAuthorization(













                hasPermission(SET_TIME_ZONE, caller.getPackageName()));













                hasPermission(SET_TIME_ZONE, callerPackageName));















        } else {















            Objects.requireNonNull(who, "ComponentName is null");















            Preconditions.checkCallAuthorization(isProfileOwnerOnUser0(caller)










@@ -9255,7 +9255,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













        EnforcingAdmin enforcingAdmin = enforcePermissionAndGetEnforcingAdmin(















                /* who */ null,















                SET_TIME_ZONE,













                caller.getPackageName(),













                callerPackageName,















                UserHandle.USER_ALL















        );















        Integer state = mDevicePolicyEngine.getGlobalPolicySetByAdmin(