summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jared Duke <jdduke@google.com> 2024-06-04 21:28:39 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-06-04 21:28:39 +0000
commitd2a1d5aa5f2e6efc1e24d46281ae345262cb31e4 (patch)
treedeed56eacec3a8db96e59172ce9d81dd274dd4e4
parent60fa8313227e0f4bc902b87b90fa21862de50f91 (diff)
parentb6768d0c615b9060787dfff10beceaa7c013b0e6 (diff)
Merge "Use EventLogTags for logging" into main am: a362fe4662 am: b6768d0c61
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3101197 Change-Id: I9a2387c2b4758993b9b40e1924fd430defebc801 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java18
1 files changed, 4 insertions, 14 deletions
diff --git a/packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java b/packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java
index 635dc420f18c..5a530c4deefb 100644
--- a/packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java
+++ b/packages/DynamicSystemInstallationService/src/com/android/dynsystem/DynamicSystemInstallationService.java
@@ -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();
}
/*