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

Merge "Add proto tombstones to Dropbox." am: 3361ca6c56 am: 093e8d266a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590892

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I828d8f22f643513cce2841470e272cc22231b138
This commit is contained in:
Josh Gao
2021-02-18 10:24:39 +00:00
committed by Automerger Merge Worker
parent a5ef566cd7 093e8d266a
commit a1b7331722
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,6 +75,7 @@ public class BootReceiver extends BroadcastReceiver {
private static final int GMSCORE_LASTK_LOG_SIZE = 196608;
private static final String TAG_TOMBSTONE = "SYSTEM_TOMBSTONE";
private static final String TAG_TOMBSTONE_PROTO = "SYSTEM_TOMBSTONE_PROTO";
// The pre-froyo package and class of the system updater, which
// ran in the system process. We need to remove its packages here
@@ -252,14 +253,14 @@ public class BootReceiver extends BroadcastReceiver {
* @param ctx Context
* @param tombstone path to the tombstone
*/
public static void addTombstoneToDropBox(Context ctx, File tombstone) {
public static void addTombstoneToDropBox(Context ctx, File tombstone, boolean proto) {
final DropBoxManager db = ctx.getSystemService(DropBoxManager.class);
final String bootReason = SystemProperties.get("ro.boot.bootreason", null);
HashMap<String, Long> timestamps = readTimestamps();
try {
final String headers = getBootHeadersToLogAndUpdate();
addFileToDropBox(db, timestamps, headers, tombstone.getPath(), LOG_SIZE,
TAG_TOMBSTONE);
proto ? TAG_TOMBSTONE_PROTO : TAG_TOMBSTONE);
} catch (IOException e) {
Slog.e(TAG, "Can't log tombstone", e);
}

3
services/core/java/com/android/server/os/NativeTombstoneManager.java
View File

@@ -114,8 +114,9 @@ public final class NativeTombstoneManager {
if (filename.endsWith(".pb")) {
handleProtoTombstone(path);
BootReceiver.addTombstoneToDropBox(mContext, path, true);
} else {
BootReceiver.addTombstoneToDropBox(mContext, path);
BootReceiver.addTombstoneToDropBox(mContext, path, false);
}
}