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

Merge "Rename *AppIdle to *AppInactive per api-council" into mnc-dev

Browse Source
This commit is contained in:
Amith Yamasani
2015-05-11 16:11:13 +00:00
committed by Android (Google) Code Review
parent c454f786e2 e5f330456b
commit a5b2684c25
6 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -6161,7 +6161,7 @@ package android.app.usage {
}
public final class UsageStatsManager {
method public boolean isAppIdle(java.lang.String);
method public boolean isAppInactive(java.lang.String);
method public java.util.Map<java.lang.String, android.app.usage.UsageStats> queryAndAggregateUsageStats(long, long);
method public java.util.List<android.app.usage.ConfigurationStats> queryConfigurations(int, long, long);
method public android.app.usage.UsageEvents queryEvents(long, long);

2
api/system-current.txt
View File

@@ -6350,7 +6350,7 @@ package android.app.usage {
}
public final class UsageStatsManager {
method public boolean isAppIdle(java.lang.String);
method public boolean isAppInactive(java.lang.String);
method public java.util.Map<java.lang.String, android.app.usage.UsageStats> queryAndAggregateUsageStats(long, long);
method public java.util.List<android.app.usage.ConfigurationStats> queryConfigurations(int, long, long);
method public android.app.usage.UsageEvents queryEvents(long, long);

24
cmds/am/src/com/android/commands/am/Am.java
View File

@@ -142,8 +142,8 @@ public class Am extends BaseCommand {
" am task resizeable <TASK_ID> [true|false]\n" +
" am task resize <TASK_ID> <LEFT,TOP,RIGHT,BOTTOM>\n" +
" am get-config\n" +
" am set-idle [--user <USER_ID>] <PACKAGE> true|false\n" +
" am get-idle [--user <USER_ID>] <PACKAGE>\n" +
" am set-inactive [--user <USER_ID>] <PACKAGE> true|false\n" +
" am get-inactive [--user <USER_ID>] <PACKAGE>\n" +
"\n" +
"am start: start an Activity. Options are:\n" +
" -D: enable debugging\n" +
@@ -284,9 +284,9 @@ public class Am extends BaseCommand {
"am get-config: retrieve the configuration and any recent configurations\n" +
" of the device\n" +
"\n" +
"am set-idle: sets the idle state of an app\n" +
"am set-inactive: sets the inactive state of an app\n" +
"\n" +
"am get-idle: returns the idle state of an app\n" +
"am get-inactive: returns the inactive state of an app\n" +
"\n" +
"\n" +
"<INTENT> specifications include these flags and arguments:\n" +
@@ -395,10 +395,10 @@ public class Am extends BaseCommand {
runTask();
} else if (op.equals("get-config")) {
runGetConfig();
} else if (op.equals("set-idle")) {
runSetIdle();
} else if (op.equals("get-idle")) {
runGetIdle();
} else if (op.equals("set-inactive")) {
runSetInactive();
} else if (op.equals("get-inactive")) {
runGetInactive();
} else {
showError("Error: unknown command '" + op + "'");
}
@@ -2030,7 +2030,7 @@ public class Am extends BaseCommand {
}
}
private void runSetIdle() throws Exception {
private void runSetInactive() throws Exception {
int userId = UserHandle.USER_OWNER;
String opt;
@@ -2047,10 +2047,10 @@ public class Am extends BaseCommand {
IUsageStatsManager usm = IUsageStatsManager.Stub.asInterface(ServiceManager.getService(
Context.USAGE_STATS_SERVICE));
usm.setAppIdle(packageName, Boolean.parseBoolean(value), userId);
usm.setAppInactive(packageName, Boolean.parseBoolean(value), userId);
}
private void runGetIdle() throws Exception {
private void runGetInactive() throws Exception {
int userId = UserHandle.USER_OWNER;
String opt;
@@ -2066,7 +2066,7 @@ public class Am extends BaseCommand {
IUsageStatsManager usm = IUsageStatsManager.Stub.asInterface(ServiceManager.getService(
Context.USAGE_STATS_SERVICE));
boolean isIdle = usm.isAppIdle(packageName, userId);
boolean isIdle = usm.isAppInactive(packageName, userId);
System.out.println("Idle=" + isIdle);
}

4
core/java/android/app/usage/IUsageStatsManager.aidl
View File

@@ -30,6 +30,6 @@ interface IUsageStatsManager {
ParceledListSlice queryConfigurationStats(int bucketType, long beginTime, long endTime,
String callingPackage);
UsageEvents queryEvents(long beginTime, long endTime, String callingPackage);
void setAppIdle(String packageName, boolean idle, int userId);
boolean isAppIdle(String packageName, int userId);
void setAppInactive(String packageName, boolean inactive, int userId);
boolean isAppInactive(String packageName, int userId);
}

8
core/java/android/app/usage/UsageStatsManager.java
View File

@@ -220,15 +220,15 @@ public final class UsageStatsManager {
}
/**
* Returns whether the specified app is currently considered idle. This will be true if the
* Returns whether the specified app is currently considered inactive. This will be true if the
* app hasn't been used directly or indirectly for a period of time defined by the system. This
* could be of the order of several hours or days.
* @param packageName The package name of the app to query
* @return whether the app is currently considered idle
* @return whether the app is currently considered inactive
*/
public boolean isAppIdle(String packageName) {
public boolean isAppInactive(String packageName) {
try {
return mService.isAppIdle(packageName, UserHandle.myUserId());
return mService.isAppInactive(packageName, UserHandle.myUserId());
} catch (RemoteException e) {
// fall through and return default
}

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

@@ -718,10 +718,10 @@ public class UsageStatsService extends SystemService implements
}
@Override
public boolean isAppIdle(String packageName, int userId) {
public boolean isAppInactive(String packageName, int userId) {
try {
userId = ActivityManagerNative.getDefault().handleIncomingUser(Binder.getCallingPid(),
Binder.getCallingUid(), userId, false, true, "isAppIdle", null);
Binder.getCallingUid(), userId, false, true, "isAppInactive", null);
} catch (RemoteException re) {
return false;
}
@@ -734,7 +734,7 @@ public class UsageStatsService extends SystemService implements
}
@Override
public void setAppIdle(String packageName, boolean idle, int userId) {
public void setAppInactive(String packageName, boolean idle, int userId) {
final int callingUid = Binder.getCallingUid();
try {
userId = ActivityManagerNative.getDefault().handleIncomingUser(