am d1706063: am 3d32a1c0: Merge "Allow settings to change app inactive state" into mnc-dev

* commit 'd170606319e10d1140cb58d6f959efb91d162441':
  Allow settings to change app inactive state
This commit is contained in:
Amith Yamasani
2015-05-14 01:46:49 +00:00
committed by Android Git Automerger
2 changed files with 13 additions and 1 deletions

View File

@@ -234,4 +234,15 @@ public final class UsageStatsManager {
}
return false;
}
/**
* @hide
*/
public void setAppInactive(String packageName, boolean inactive) {
try {
mService.setAppInactive(packageName, inactive, UserHandle.myUserId());
} catch (RemoteException e) {
// fall through
}
}
}

View File

@@ -100,7 +100,7 @@ public class UsageStatsService extends SystemService implements
static final long DEFAULT_APP_IDLE_THRESHOLD_MILLIS = DEBUG ? ONE_MINUTE * 4
: 1L * 24 * 60 * ONE_MINUTE; // 1 day
static final long DEFAULT_CHECK_IDLE_INTERVAL = DEBUG ? ONE_MINUTE / 4
static final long DEFAULT_CHECK_IDLE_INTERVAL = DEBUG ? ONE_MINUTE
: 8 * 60 * ONE_MINUTE; // 8 hours
static final long DEFAULT_PAROLE_INTERVAL = DEBUG ? ONE_MINUTE * 10
: 24 * 60 * ONE_MINUTE; // 24 hours between paroles
@@ -336,6 +336,7 @@ public class UsageStatsService extends SystemService implements
/** Check all running users' apps to see if they enter an idle state. */
void checkIdleStates() {
if (DEBUG) Slog.d(TAG, "Checking idle state");
final int[] runningUsers;
try {
runningUsers = ActivityManagerNative.getDefault().getRunningUserIds();