diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-06-11 22:02:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-11 22:02:37 +0000 |
| commit | 2e49bfa6f02a4ab831a43453231888aa6d9c4ce1 (patch) | |
| tree | c292927c0e11403734d817f72ad569682f9ea3e3 /api | |
| parent | 06f3cd8e8b03786851cc6c9b79487c9c8516e883 (diff) | |
| parent | c8e8729244d75584ce71a74d29c452fe538a22c5 (diff) | |
| download | frameworks_base-2e49bfa6f02a4ab831a43453231888aa6d9c4ce1.zip frameworks_base-2e49bfa6f02a4ab831a43453231888aa6d9c4ce1.tar.gz frameworks_base-2e49bfa6f02a4ab831a43453231888aa6d9c4ce1.tar.bz2 | |
Merge "UsageStats: Change INTERACTION to SYSTEM_INTERACTION" 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 ec56ce0..664c74b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6123,10 +6123,10 @@ 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 + field public static final int USER_INTERACTION = 7; // 0x7 } public final class UsageStats implements android.os.Parcelable { diff --git a/api/system-current.txt b/api/system-current.txt index 5ec8a62..79c7353 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -6313,10 +6313,10 @@ 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 + field public static final int USER_INTERACTION = 7; // 0x7 } public final class UsageStats implements android.os.Parcelable { |