Merge "Add @TestApi to SystemApis in SystemProperties Test: build and flash Android Bug: 143620678"
diff --git a/api/test-current.txt b/api/test-current.txt
index 76cda54..5b16743 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -2066,6 +2066,8 @@
method @NonNull public static String get(@NonNull String);
method @NonNull public static String get(@NonNull String, @Nullable String);
method public static boolean getBoolean(@NonNull String, boolean);
+ method public static int getInt(@NonNull String, int);
+ method public static long getLong(@NonNull String, long);
}
public final class UserHandle implements android.os.Parcelable {
diff --git a/core/java/android/os/SystemProperties.java b/core/java/android/os/SystemProperties.java
index d4abf28..9d14d9d 100644
--- a/core/java/android/os/SystemProperties.java
+++ b/core/java/android/os/SystemProperties.java
@@ -151,6 +151,7 @@
* @hide
*/
@SystemApi
+ @TestApi
public static int getInt(@NonNull String key, int def) {
if (TRACK_KEY_ACCESS) onKeyAccess(key);
return native_get_int(key, def);
@@ -166,6 +167,7 @@
* @hide
*/
@SystemApi
+ @TestApi
public static long getLong(@NonNull String key, long def) {
if (TRACK_KEY_ACCESS) onKeyAccess(key);
return native_get_long(key, def);