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

Merge "Don't inform usage stats of interaction for a toast" into nyc-mr1-dev

Browse Source
This commit is contained in:
Amith Yamasani
2016-09-21 21:38:18 +00:00
committed by Android (Google) Code Review
parent 103922f8c6 43caafa2b6
commit be2db1ef72
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20700,8 +20700,10 @@ public final class ActivityManagerService extends ActivityManagerNative
isInteraction = nowElapsed > app.fgInteractionTime + SERVICE_USAGE_INTERACTION_TIME; isInteraction = nowElapsed > app.fgInteractionTime + SERVICE_USAGE_INTERACTION_TIME;
} }
} else { } else {
isInteraction = app.curProcState // If the app was being forced to the foreground, by say a Toast, then
<= ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND; // no need to treat it as an interaction
isInteraction = app.forcingToForeground == null
&& app.curProcState <= ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND;
app.fgInteractionTime = 0; app.fgInteractionTime = 0;
} }
if (isInteraction && (!app.reportedInteraction if (isInteraction && (!app.reportedInteraction