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

Merge "Ignore the active network scorer when checking for idleness" into mnc-dev

Browse Source
This commit is contained in:
Wenchao Tong
2015-07-23 18:14:47 +00:00
committed by Android (Google) Code Review
parent 2abf0f24af 7cc902bea7
commit bf3a24d5ec
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/usage/java/com/android/server/usage/UsageStatsService.java
View File

@@ -42,6 +42,7 @@ import android.content.pm.UserInfo;
import android.content.res.Configuration;
import android.database.ContentObserver;
import android.hardware.display.DisplayManager;
import android.net.NetworkScoreManager;
import android.os.BatteryManager;
import android.os.BatteryStats;
import android.os.Binder;
@@ -812,6 +813,10 @@ public class UsageStatsService extends SystemService implements
return false;
}
if (isActiveNetworkScorer(packageName)) {
return false;
}
if (mAppWidgetManager != null
&& mAppWidgetManager.isBoundWidgetPackage(packageName, userId)) {
return false;
@@ -847,6 +852,12 @@ public class UsageStatsService extends SystemService implements
== TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS;
}
private boolean isActiveNetworkScorer(String packageName) {
NetworkScoreManager nsm = (NetworkScoreManager) getContext().getSystemService(
Context.NETWORK_SCORE_SERVICE);
return packageName != null && packageName.equals(nsm.getActiveScorerPackage());
}
void informListeners(String packageName, int userId, boolean isIdle) {
for (AppIdleStateChangeListener listener : mPackageAccessListeners) {
listener.onAppIdleStateChanged(packageName, userId, isIdle);