Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 543275c5 authored by Michael Wachenschwanz's avatar Michael Wachenschwanz Committed by android-build-merger
Browse files

Merge "Make SYSTEM_INTERACTION a SystemApi" into pi-dev 

am: 06ce5f68

Change-Id: Ieef7dc8027f0c81b8dfafa08b3d626adf3cfe75f
parents 4827fc32 06ce5f68

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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 {

core/java/android/app/usage/UsageEvents.java

+1 −0
Original line number Diff line number Diff line
@@ -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;



        /**