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

Merge "Add fileds to AppCrash and ANR atoms" into pi-dev

Browse Source 
am: 60a24b97f7

Change-Id: I45399dc23e13fc7030a66f6d6166d6f2434640ba
This commit is contained in:
Chenjie Yu
2018-04-02 22:00:21 -07:00
committed by android-build-merger
parent 5f07ff8248 60a24b97f7
commit 27b723d0dc
3 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cmds/statsd/src/atoms.proto
View File

@@ -1225,6 +1225,22 @@ message AppCrashOccurred {
// The pid if available. -1 means not available.
optional sint32 pid = 4;
optional string package_name = 5;
enum InstantApp {
UNAVAILABLE = 0;
FALSE = 1;
TRUE = 2;
}
optional InstantApp is_instant_app = 6;
enum ForegroundState {
UNKNOWN = 0;
BACKGROUND = 1;
FOREGROUND = 2;
}
optional ForegroundState foreground_state = 7;
}
/**
@@ -1266,6 +1282,20 @@ message ANROccurred {
optional string short_component_name = 3;
optional string reason = 4;
enum InstantApp {
UNAVAILABLE = 0;
FALSE = 1;
TRUE = 2;
}
optional InstantApp is_instant_app = 5;
enum ForegroundState {
UNKNOWN = 0;
BACKGROUND = 1;
FOREGROUND = 2;
}
optional ForegroundState foreground_state = 6;
}
/*

12
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -15098,7 +15098,17 @@ public class ActivityManagerService extends IActivityManager.Stub
Binder.getCallingUid(),
eventType,
processName,
Binder.getCallingPid());
Binder.getCallingPid(),
(r != null && r.info != null) ? r.info.packageName : "",
(r != null && r.info != null) ? (r.info.isInstantApp()
? StatsLog.APP_CRASH_OCCURRED__IS_INSTANT_APP__TRUE
: StatsLog.APP_CRASH_OCCURRED__IS_INSTANT_APP__FALSE)
: StatsLog.APP_CRASH_OCCURRED__IS_INSTANT_APP__UNAVAILABLE,
r != null ? (r.isInterestingToUserLocked()
? StatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__FOREGROUND
: StatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__BACKGROUND)
: StatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__UNKNOWN
);
addErrorToDropBox(eventType, r, processName, null, null, null, null, null, crashInfo);

10
services/core/java/com/android/server/am/AppErrors.java
View File

@@ -1041,7 +1041,15 @@ class AppErrors {
}
StatsLog.write(StatsLog.ANR_OCCURRED, app.uid, app.processName,
activity == null ? "unknown": activity.shortComponentName, annotation);
activity == null ? "unknown": activity.shortComponentName, annotation,
(app.info != null) ? (app.info.isInstantApp()
? StatsLog.ANROCCURRED__IS_INSTANT_APP__TRUE
: StatsLog.ANROCCURRED__IS_INSTANT_APP__FALSE)
: StatsLog.ANROCCURRED__IS_INSTANT_APP__UNAVAILABLE,
app != null ? (app.isInterestingToUserLocked()
? StatsLog.ANROCCURRED__FOREGROUND_STATE__FOREGROUND
: StatsLog.ANROCCURRED__FOREGROUND_STATE__BACKGROUND)
: StatsLog.ANROCCURRED__FOREGROUND_STATE__UNKNOWN);
mService.addErrorToDropBox("anr", app, app.processName, activity, parent, annotation,
cpuInfo, tracesFile, null);