diff options
| author | 2018-03-20 21:31:58 +0000 | |
|---|---|---|
| committer | 2018-03-20 21:31:58 +0000 | |
| commit | 06ce5f6803c65bb69f2961ba4e917b57da45058b (patch) | |
| tree | 2ecc4a1c6a30d26af6f4658997b38545f1e8d2e7 | |
| parent | 651667cea110fe4278bbbca8c6819fb4a9e7798f (diff) | |
| parent | f0acb024331a0f4062a57ceef7e58c919a64d880 (diff) | |
Merge "Make SYSTEM_INTERACTION a SystemApi" into pi-dev
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/usage/UsageEvents.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index e1b576de15ac..d1ed86e5787a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -723,6 +723,7 @@ package android.app.usage { method public java.lang.String getNotificationChannelId(); field public static final int NOTIFICATION_INTERRUPTION = 12; // 0xc field public static final int NOTIFICATION_SEEN = 10; // 0xa + field public static final int SYSTEM_INTERACTION = 6; // 0x6 } public final class UsageStatsManager { diff --git a/core/java/android/app/usage/UsageEvents.java b/core/java/android/app/usage/UsageEvents.java index 4c7e97bcb8da..8550ac0f32cd 100644 --- a/core/java/android/app/usage/UsageEvents.java +++ b/core/java/android/app/usage/UsageEvents.java @@ -81,6 +81,7 @@ public final class UsageEvents implements Parcelable { * An event type denoting that a package was interacted with in some way by the system. * @hide */ + @SystemApi public static final int SYSTEM_INTERACTION = 6; /** |