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

Commit 8565e714 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT" am: 8608d062 

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

Change-Id: I13655def2a6e5913031814490106296bc609959f
parents 0c671e5c 8608d062

core/api/module-lib-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,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
@@ -1037,7 +1037,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
@@ -333,7 +333,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/server/SystemConfig.java

+2 −2
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ public class SystemConfig { 
        // Vendors are only allowed to customize these

        int vendorPermissionFlag = ALLOW_LIBS | ALLOW_FEATURES | ALLOW_PRIVAPP_PERMISSIONS

                | ALLOW_ASSOCIATIONS;

        if (Build.VERSION.FIRST_SDK_INT <= Build.VERSION_CODES.O_MR1) {

        if (Build.VERSION.DEVICE_INITIAL_SDK_INT <= Build.VERSION_CODES.O_MR1) {

            // For backward compatibility

            vendorPermissionFlag |= (ALLOW_PERMISSIONS | ALLOW_APP_CONFIGS);

        }
@@ -1252,7 +1252,7 @@ public class SystemConfig { 
            addFeature(PackageManager.FEATURE_APP_ENUMERATION, 0);

        }



        if (Build.VERSION.FIRST_SDK_INT >= Build.VERSION_CODES.Q) {

        if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.Q) {

            addFeature(PackageManager.FEATURE_IPSEC_TUNNELS, 0);

        }