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

Commit 230a3407 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Add VERSION_CODES constant for S" am: dfe33cb7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513731

Change-Id: Ib41868f0c19d300fbbf0f5cc3cbf922ef4ece5b8
parents 5928b5bc dfe33cb7

core/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -34461,6 +34461,7 @@ package android.os { 
    field public static final int P = 28; // 0x1c

    field public static final int P = 28; // 0x1c

    field public static final int Q = 29; // 0x1d

    field public static final int Q = 29; // 0x1d

    field public static final int R = 30; // 0x1e

    field public static final int R = 30; // 0x1e

    field public static final int S = 10000; // 0x2710

  }

  }

















  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {







  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

























core/java/android/os/Build.java



+5
−0




























Original line number
Original line
Diff line number
Diff line








@@ -1041,6 +1041,11 @@ public class Build {









         *







         *











         */







         */











        public static final int R = 30;







        public static final int R = 30;





























        /**














         * S.














         */














        public static final int S = CUR_DEVELOPMENT;











    }







    }































    /** The type of build, like "user" or "eng". */







    /** The type of build, like "user" or "eng". */