summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alex Buynytskyy <alexbuy@google.com> 2023-04-21 18:32:26 +0000
committer Alex Buynytskyy <alexbuy@google.com> 2023-04-23 19:22:36 +0000
commita1409eda1b3dfd4a998815d4a16f8b0d99e9c732 (patch)
treebecde6fa4f55e09cf89c32da852b570252818384
parent8bcb06a14645efcc95a53065ed34cbc68193390f (diff)
[RESTRICT AUTOMERGE] Revert "Don't force +1 for resource resolution."
This reverts commit a79ccc5b1d15f33316145b9b98441a1afc828e0d. Reason for revert: UpsideDownCake/34 is now REL Ignore-AOSP-First: UpsideDownCake Finalization Bug: 275409981 Test: build Change-Id: Ie6fb138edd20f02246ff2d3924497b1369d762f5 Merged-In: Ie6fb138edd20f02246ff2d3924497b1369d762f5
-rwxr-xr-xcore/java/android/os/Build.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 7383e633fb93..9f9c2222f9d9 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -493,7 +493,7 @@ public class Build {
* @hide
*/
@TestApi
- public static final int RESOURCES_SDK_INT = SDK_INT;
+ public static final int RESOURCES_SDK_INT = SDK_INT + ACTIVE_CODENAMES.length;
/**
* The current lowest supported value of app target SDK. Applications targeting