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

Commit 65bc303f authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT" into sc-dev am: 036d189a 

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

Change-Id: Iaae05598a4d39e4706a5cbbaf2dbc7e6f85de35b
parents 84face64 036d189a

core/api/module-lib-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ package android.os { 
  }



  public static class Build.VERSION {

    field public static final int FIRST_SDK_INT;

    field public static final int DEVICE_INITIAL_SDK_INT;

  }



  public interface Parcelable {

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1603,7 +1603,7 @@ package android.os { 


  public static class Build.VERSION {

    field public static final String[] ACTIVE_CODENAMES;

    field public static final int FIRST_SDK_INT;

    field public static final int DEVICE_INITIAL_SDK_INT;

    field public static final int RESOURCES_SDK_INT;

  }

core/java/android/net/IpSecAlgorithm.java

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ public final class IpSecAlgorithm implements Parcelable { 
        }



        for (Entry<String, Integer> entry : ALGO_TO_REQUIRED_FIRST_SDK.entrySet()) {

            if (Build.VERSION.FIRST_SDK_INT >= entry.getValue()) {

            if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= entry.getValue()) {

                enabledAlgos.add(entry.getKey());

            }

        }

core/java/android/os/Build.java

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ public class Build { 
         */

        @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

        @TestApi

        public static final int FIRST_SDK_INT = SystemProperties

        public static final int DEVICE_INITIAL_SDK_INT = SystemProperties

                .getInt("ro.product.first_api_level", 0);



        /**

core/java/com/android/internal/security/VerityUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public abstract class VerityUtils { 
    private static final boolean DEBUG = false;



    public static boolean isFsVeritySupported() {

        return Build.VERSION.FIRST_SDK_INT >= Build.VERSION_CODES.R

        return Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.R

                || SystemProperties.getInt("ro.apk_verity.mode", 0) == 2;

    }