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

Commit 37116a53 authored by Jared Duke's avatar Jared Duke
Browse files

Use EventLogTags for logging

The generated EventLogTags helper class has the appropriate event IDs,
so use it for logging-related calls.

Bug: 203241149
Test: atest DynamicSystemInstallationServiceTests
Change-Id: I488b9fe53d0b3fbfdedc41037f604c60b9fca82f
parent f99d2e86
Loading
Loading
Loading
Loading
+4 −14
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ import android.os.RemoteException;
import android.os.image.DynamicSystemClient;
import android.os.image.DynamicSystemManager;
import android.text.TextUtils;
import android.util.EventLog;
import android.util.Log;
import android.widget.Toast;

@@ -104,14 +103,6 @@ public class DynamicSystemInstallationService extends Service
    private static final String NOTIFICATION_CHANNEL_ID = "com.android.dynsystem";
    private static final int NOTIFICATION_ID = 1;

    /*
     * Event log tags
     */
    private static final int EVENT_DSU_PROGRESS_UPDATE = 120000;
    private static final int EVENT_DSU_INSTALL_COMPLETE = 120001;
    private static final int EVENT_DSU_INSTALL_FAILED = 120002;
    private static final int EVENT_DSU_INSTALL_INSUFFICIENT_SPACE = 120003;

    protected static void logEventProgressUpdate(
            String partitionName,
            long installedBytes,
@@ -119,8 +110,7 @@ public class DynamicSystemInstallationService extends Service
            int partitionNumber,
            int totalPartitionNumber,
            int totalProgressPercentage) {
        EventLog.writeEvent(
                EVENT_DSU_PROGRESS_UPDATE,
        EventLogTags.writeDsuProgressUpdate(
                partitionName,
                installedBytes,
                totalBytes,
@@ -130,15 +120,15 @@ public class DynamicSystemInstallationService extends Service
    }

    protected static void logEventComplete() {
        EventLog.writeEvent(EVENT_DSU_INSTALL_COMPLETE);
        EventLogTags.writeDsuInstallComplete();
    }

    protected static void logEventFailed(String cause) {
        EventLog.writeEvent(EVENT_DSU_INSTALL_FAILED, cause);
        EventLogTags.writeDsuInstallFailed(cause);
    }

    protected static void logEventInsufficientSpace() {
        EventLog.writeEvent(EVENT_DSU_INSTALL_INSUFFICIENT_SPACE);
        EventLogTags.writeDsuInstallInsufficientSpace();
    }

    /*