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

Commit 754682e5 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Fix the build."

parents 583fcb91 43e8eb1e

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -10786,8 +10786,8 @@ package android.media { 














  public class MediaActionSound {















    ctor public MediaActionSound();













    method public void load(int);













    method public void play(int);













    method public synchronized void load(int);













    method public synchronized void play(int);















    method public void release();















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















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










@@ -23584,7 +23584,7 @@ package android.view {













    field public static final android.util.Property ROTATION_Y;















    field public static final android.util.Property SCALE_X;















    field public static final android.util.Property SCALE_Y;













    field public static final int SCREEN_STATE_OFF = 2; // 0x2













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















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















    field public static final int SCROLLBARS_INSIDE_INSET = 16777216; // 0x1000000















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