Merge "Make SYSTEM_INTERACTION a SystemApi" into pi-dev

am: 06ce5f6803 Change-Id: Ieef7dc8027f0c81b8dfafa08b3d626adf3cfe75f
2018-03-21 00:03:53 +00:00
parent 4827fc3253 06ce5f6803
commit 543275c541
2 changed files with 2 additions and 0 deletions
--- 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 {
--- 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;

        /**