diff options
| author | 2017-12-04 13:02:11 -0800 | |
|---|---|---|
| committer | 2017-12-08 09:52:17 -0800 | |
| commit | bafcd7b59519ce67738c870cf9b69a7c0583cc9b (patch) | |
| tree | 9569b9c02550523e1099f96f7ad91d5a302fb52a | |
| parent | 23627fbff5f13629e997a00b006a1ebdc423e735 (diff) | |
BootReceiver: Added an event log after the dropbox file copy is successful.
The log can be used to test if LAST KMSG or other items are copied
to dropbox successfully, especially in user builds without root
privilege.
BUG: 69685635
Test: manually verified the desired log from bugreport on user
and userdebug builds.
Change-Id: Ie6033bf04c7f79fc596761ab751aa5fcea2c1130
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | core/java/com/android/server/BootReceiver.java | 3 | ||||
| -rw-r--r-- | core/java/com/android/server/DropboxLogTags.logtags | 12 |
3 files changed, 16 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 82589c1ecfe2..40757a952eda 100644 --- a/Android.bp +++ b/Android.bp @@ -545,6 +545,7 @@ java_library { "core/java/android/net/EventLogTags.logtags", "core/java/android/webkit/EventLogTags.logtags", "core/java/com/android/internal/logging/EventLogTags.logtags", + "core/java/com/android/server/DropboxLogTags.logtags", ":framework-statslog-gen", ], diff --git a/core/java/com/android/server/BootReceiver.java b/core/java/com/android/server/BootReceiver.java index 43544862b5ec..8848e3939008 100644 --- a/core/java/com/android/server/BootReceiver.java +++ b/core/java/com/android/server/BootReceiver.java @@ -33,6 +33,7 @@ import android.os.storage.StorageManager; import android.provider.Downloads; import android.text.TextUtils; import android.util.AtomicFile; +import android.util.EventLog; import android.util.Slog; import android.util.Xml; @@ -40,6 +41,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.MetricsLogger; import com.android.internal.util.FastXmlSerializer; import com.android.internal.util.XmlUtils; +import com.android.server.DropboxLogTags; import java.io.File; import java.io.FileInputStream; @@ -297,6 +299,7 @@ public class BootReceiver extends BroadcastReceiver { Slog.i(TAG, "Copying " + filename + " to DropBox (" + tag + ")"); db.addText(tag, headers + FileUtils.readTextFile(file, maxSize, "[[TRUNCATED]]\n") + footers); + EventLog.writeEvent(DropboxLogTags.DROPBOX_FILE_COPY, filename, maxSize, tag); } private static void addAuditErrorsToDropBox(DropBoxManager db, diff --git a/core/java/com/android/server/DropboxLogTags.logtags b/core/java/com/android/server/DropboxLogTags.logtags new file mode 100644 index 000000000000..c461cfed9ceb --- /dev/null +++ b/core/java/com/android/server/DropboxLogTags.logtags @@ -0,0 +1,12 @@ +# See system/core/logcat/event.logtags for a description of the format of this file. + +# The java package name happens to be the same as frameworks/base/services/core +# /java/com/android/server/EventLogTags.logtags. To avoid conflict, this file's name cannot +# be EventLogTags.logtags because it generates a class with the same name. + +option java_package com.android.server; + +# ----------------------------- +# BootReceiver.java +# ----------------------------- +81002 dropbox_file_copy (FileName|3),(Size|1),(Tag|3) |