Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BootReceiver: Added an event log after the dropbox file copy is successful." am: 5323d42b82

Browse Source 
am: c044749416

Change-Id: If096fea07e31abbd8c5c418c776296c1200009d9
This commit is contained in:
Siyuan Zhou
2017-12-09 03:18:08 +00:00
committed by android-build-merger
parent a312cf38f9 c044749416
commit 89df84bfb4
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -530,6 +530,7 @@ java_library {
"core/java/android/net/EventLogTags.logtags", "core/java/android/net/EventLogTags.logtags",
"core/java/android/webkit/EventLogTags.logtags", "core/java/android/webkit/EventLogTags.logtags",
"core/java/com/android/internal/logging/EventLogTags.logtags", "core/java/com/android/internal/logging/EventLogTags.logtags",
"core/java/com/android/server/DropboxLogTags.logtags",
], ],
aidl: { aidl: {

3
core/java/com/android/server/BootReceiver.java
View File

@@ -33,6 +33,7 @@ import android.os.storage.StorageManager;
import android.provider.Downloads; import android.provider.Downloads;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AtomicFile; import android.util.AtomicFile;
import android.util.EventLog;
import android.util.Slog; import android.util.Slog;
import android.util.Xml; import android.util.Xml;
@@ -40,6 +41,7 @@ import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsLogger;
import com.android.internal.util.FastXmlSerializer; import com.android.internal.util.FastXmlSerializer;
import com.android.internal.util.XmlUtils; import com.android.internal.util.XmlUtils;
import com.android.server.DropboxLogTags;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@@ -297,6 +299,7 @@ public class BootReceiver extends BroadcastReceiver {
Slog.i(TAG, "Copying " + filename + " to DropBox (" + tag + ")"); Slog.i(TAG, "Copying " + filename + " to DropBox (" + tag + ")");
db.addText(tag, headers + FileUtils.readTextFile(file, maxSize, "[[TRUNCATED]]\n") + db.addText(tag, headers + FileUtils.readTextFile(file, maxSize, "[[TRUNCATED]]\n") +
footers); footers);
EventLog.writeEvent(DropboxLogTags.DROPBOX_FILE_COPY, filename, maxSize, tag);
} }
private static void addAuditErrorsToDropBox(DropBoxManager db, private static void addAuditErrorsToDropBox(DropBoxManager db,

12
core/java/com/android/server/DropboxLogTags.logtags Normal file
View File

@@ -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)