From a1409eda1b3dfd4a998815d4a16f8b0d99e9c732 Mon Sep 17 00:00:00 2001
From: Alex Buynytskyy <alexbuy@google.com>
Date: Fri, 21 Apr 2023 18:32:26 +0000
Subject: [PATCH] [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
---
 core/java/android/os/Build.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 7383e633fb93a..9f9c2222f9d9d 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