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

Commit 76e287b4 authored by Richard Coles's avatar Richard Coles Committed by Android (Google) Code Review
Browse files

Merge "Update system API to match current code." into nyc-dev

parents 3916bb04 5d3f3bb9

api/system-current.txt

+1 −2
Original line number Diff line number Diff line
@@ -31331,8 +31331,8 @@ package android.os { 
    field public static final int RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY = 1; // 0x1

    field public static final deprecated int SCREEN_BRIGHT_WAKE_LOCK = 10; // 0xa

    field public static final deprecated int SCREEN_DIM_WAKE_LOCK = 6; // 0x6

    field public static final int USER_ACTIVITY_EVENT_ACCESSIBILITY = 3; // 0x3

    field public static final int SUSTAINED_PERFORMANCE_WAKE_LOCK = 256; // 0x100

    field public static final int USER_ACTIVITY_EVENT_ACCESSIBILITY = 3; // 0x3

    field public static final int USER_ACTIVITY_EVENT_BUTTON = 1; // 0x1

    field public static final int USER_ACTIVITY_EVENT_OTHER = 0; // 0x0

    field public static final int USER_ACTIVITY_EVENT_TOUCH = 2; // 0x2
@@ -32675,7 +32675,6 @@ package android.printservice.recommendation { 
    method public final android.os.IBinder onBind(android.content.Intent);

    method public abstract void onConnected();

    method public abstract void onDisconnected();

    method public final boolean onUnbind(android.content.Intent);

    method public final void updateRecommendations(java.util.List<android.printservice.recommendation.RecommendationInfo>);

  }