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

Merge "Don't touch usage stats before system ready" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-29 17:09:32 +00:00
committed by Android (Google) Code Review
parent e2782906b5 09d3285503
commit 3462c194db
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20669,8 +20669,11 @@ public final class ActivityManagerService extends ActivityManagerNative
final long now = SystemClock.elapsedRealtime(); final long now = SystemClock.elapsedRealtime();
Long lastReported = userState.mProviderLastReportedFg.get(authority); Long lastReported = userState.mProviderLastReportedFg.get(authority);
if (lastReported == null || lastReported < now - 60 * 1000L) { if (lastReported == null || lastReported < now - 60 * 1000L) {
mUsageStatsService.reportContentProviderUsage( if (mSystemReady) {
authority, providerPkgName, app.userId); // Cannot touch the user stats if not system ready
mUsageStatsService.reportContentProviderUsage(
authority, providerPkgName, app.userId);
}
userState.mProviderLastReportedFg.put(authority, now); userState.mProviderLastReportedFg.put(authority, now);
} }
} }