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

Commit 016950a4 authored by paulhu's avatar paulhu
Browse files

Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT 

As API review feedback, rename Build#VERSION#FIRST_SDK_INT to
Build#VERSION#DEVICE_INITIAL_SDK_INT. As well as update all usage
in frameworks and tests.

Bug: 184735771
Test: m
Change-Id: I72660959cb4e638a8e80fcf2f4e96ea172969f44
parent bd888709

core/api/module-lib-current.txt

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

    }