diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-03-02 22:22:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-02 22:22:58 +0000 |
| commit | a4005662c7a22b457a6db092426f16b240902732 (patch) | |
| tree | fda1861c00e64ab4d7b0ce44a7c65961c8f4762d /api | |
| parent | 7b91c55b3ff4857e904a11a0a67fcc86a32868b4 (diff) | |
| parent | 978a1ed5aa2752cd36ff51df91d2d2d8be2171d9 (diff) | |
| download | frameworks_base-a4005662c7a22b457a6db092426f16b240902732.zip frameworks_base-a4005662c7a22b457a6db092426f16b240902732.tar.gz frameworks_base-a4005662c7a22b457a6db092426f16b240902732.tar.bz2 | |
Merge "Add generic "INTERACTION" event type to UsageStatsManager"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index a9cd058..00afda2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5783,6 +5783,7 @@ package android.app.usage { method public java.lang.String getPackageName(); method public long getTimeStamp(); field public static final int CONFIGURATION_CHANGE = 5; // 0x5 + field public static final int INTERACTION = 6; // 0x6 field public static final int MOVE_TO_BACKGROUND = 2; // 0x2 field public static final int MOVE_TO_FOREGROUND = 1; // 0x1 field public static final int NONE = 0; // 0x0 diff --git a/api/system-current.txt b/api/system-current.txt index 52586ed..0a68000 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5962,6 +5962,7 @@ package android.app.usage { method public java.lang.String getPackageName(); method public long getTimeStamp(); field public static final int CONFIGURATION_CHANGE = 5; // 0x5 + field public static final int INTERACTION = 6; // 0x6 field public static final int MOVE_TO_BACKGROUND = 2; // 0x2 field public static final int MOVE_TO_FOREGROUND = 1; // 0x1 field public static final int NONE = 0; // 0x0 |