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

Commit b00f655f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ensure that we always log updating from file."

parents 7ea26881 ca4a8581

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

+5 −5
Original line number Diff line number Diff line
@@ -14123,6 +14123,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
    @Override

    public void installUpdateFromFile(ComponentName admin,

            ParcelFileDescriptor updateFileDescriptor, StartInstallingUpdateCallback callback) {

        DevicePolicyEventLogger

                .createEvent(DevicePolicyEnums.INSTALL_SYSTEM_UPDATE)

                .setAdmin(admin)

                .setBoolean(isDeviceAB())

                .write();

        enforceDeviceOwner(admin);

        final long id = mInjector.binderClearCallingIdentity();

        try {
@@ -14135,11 +14140,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                        mContext, updateFileDescriptor, callback, mInjector, mConstants);

            }

            updateInstaller.startInstallUpdate();

            DevicePolicyEventLogger

                    .createEvent(DevicePolicyEnums.INSTALL_SYSTEM_UPDATE)

                    .setAdmin(admin)

                    .setBoolean(isDeviceAB())

                    .write();

        } finally {

            mInjector.binderRestoreCallingIdentity(id);

        }