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

Commit 7898548e authored by Felipe Leme's avatar Felipe Leme Committed by Android (Google) Code Review
Browse files

Merge "Minor refactoring on String formatting."

parents f9f8be93 37657342

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

+2 −2
Original line number Diff line number Diff line
@@ -6156,8 +6156,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 














        int userId = admin != null ? admin.getUserHandle().getIdentifier()















                : caller.getUserId();













        Slog.i(LOG_TAG, "wipeDataWithReason(" + wipeReasonForUser + "): admin=" + admin + ", user="













                + userId);













        Slog.i(LOG_TAG, String.format("wipeDataWithReason(%s): admin=%s, user=%d",













                wipeReasonForUser, admin, userId));















        if (calledByProfileOwnerOnOrgOwnedDevice) {















            // When wipeData is called on the parent instance, it implies wiping the entire device.















            if (calledOnParentInstance) {