• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1From c7e460bb19071d867cd7ca04282ce42694f4f358 Mon Sep 17 00:00:00 2001
2From: Alex Buynytskyy <alexbuy@google.com>
3Date: Wed, 12 Apr 2023 01:06:26 +0000
4Subject: [PATCH] Revert "Don't force +1 for resource resolution."
5
6It's not required for master.
7
8This reverts commit f1cb683988f81579a76ddbf9993848a4a06dd28c.
9
10Bug: 277674088
11Test: boots, no crashes
12Change-Id: Ia1692548f26496fdc6f1e4f0557213c7996d6823
13---
14
15diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
16index 4d3e92b..eb47170 100755
17--- a/core/java/android/os/Build.java
18+++ b/core/java/android/os/Build.java
19@@ -493,7 +493,7 @@
20          * @hide
21          */
22         @TestApi
23-        public static final int RESOURCES_SDK_INT = SDK_INT;
24+        public static final int RESOURCES_SDK_INT = SDK_INT + ACTIVE_CODENAMES.length;
25
26         /**
27          * The current lowest supported value of app target SDK. Applications targeting
28