diff options
| author | Amith Yamasani <yamasani@google.com> | 2015-05-11 16:11:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-11 16:11:14 +0000 |
| commit | a5b2684c25add3ba6ebc43c27a1abc6bce2b2af4 (patch) | |
| tree | dc704504bae79612fc08ddbfe58db1ac9bf06e62 /api | |
| parent | c454f786e2301b26afee3809a293a7fadd65434a (diff) | |
| parent | e5f330456bdf5e138485ee117929fc4337866132 (diff) | |
| download | frameworks_base-a5b2684c25add3ba6ebc43c27a1abc6bce2b2af4.zip frameworks_base-a5b2684c25add3ba6ebc43c27a1abc6bce2b2af4.tar.gz frameworks_base-a5b2684c25add3ba6ebc43c27a1abc6bce2b2af4.tar.bz2 | |
Merge "Rename *AppIdle to *AppInactive per api-council" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index c5e4bdd..fe16844 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); diff --git a/api/system-current.txt b/api/system-current.txt index 13796ff..b23efa9 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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); |