From 69f79b0aca1d4ce91db9675e9b8c3fe659998938 Mon Sep 17 00:00:00 2001
From: paulhu <paulhu@google.com>
Date: Wed, 6 Jan 2021 12:00:29 +0800
Subject: [PATCH] Expose Build.VERSION.FIRST_SDK_INT as module-lib API

Connectivity service is going to become a mainline module which
will not be able to access hidden APIs. But PermissionMonitor
needs know Build.VERSION.FIRST_SDK_INT for granting network
restricted permission to system packages. Thus, expose the value
as module-lib API to support the usage.

Bug: 170598012
Test: make update-api
Change-Id: Id0ae42120f69faee43eeb7ebd35cae9e26cb7561
---
 core/api/module-lib-current.txt | 4 ++++
 core/java/android/os/Build.java | 1 +
 2 files changed, 5 insertions(+)

diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt
index 9349770ee4fd9..45fa813098acf 100644
--- a/core/api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
@@ -28,6 +28,10 @@ package android.os {
     method public final void markVintfStability();
   }
 
+  public static class Build.VERSION {
+    field public static final int FIRST_SDK_INT;
+  }
+
   public interface Parcelable {
     method public default int getStability();
   }
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 0d8769e7635c2..10761187d9699 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -317,6 +317,7 @@ public class Build {
          * @see #SDK_INT
          * @hide
          */
+        @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
         @TestApi
         public static final int FIRST_SDK_INT = SystemProperties
                 .getInt("ro.product.first_api_level", 0);