f7a5e2fa4b
- actually do the first step instead of just logging a message, - make sure extension SDK bump gets picked up by the topic, - fix the resources_sdk_int in first step, and unfix in the second. Bug: 278246368 Fixes: 278246368 Test: local run Change-Id: I0d0f4e2ec7f0b584b9fc14a545cfec73a9fcbdea
25 lines
832 B
Diff
25 lines
832 B
Diff
From cdb47fc90b8d6860ec1dc5efada1f9ccd471618b Mon Sep 17 00:00:00 2001
|
|
From: Alex Buynytskyy <alexbuy@google.com>
|
|
Date: Tue, 11 Apr 2023 22:12:44 +0000
|
|
Subject: [PATCH] Don't force +1 for resource resolution.
|
|
|
|
Bug: 277674088
|
|
Fixes: 277674088
|
|
Test: boots, no crashes
|
|
Change-Id: I17e743a0f1cf6f98fddd40c358dea5a8b9cc7723
|
|
---
|
|
|
|
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
|
|
index eb47170..4d3e92b 100755
|
|
--- a/core/java/android/os/Build.java
|
|
+++ b/core/java/android/os/Build.java
|
|
@@ -493,7 +493,7 @@
|
|
* @hide
|
|
*/
|
|
@TestApi
|
|
- public static final int RESOURCES_SDK_INT = SDK_INT + ACTIVE_CODENAMES.length;
|
|
+ public static final int RESOURCES_SDK_INT = SDK_INT;
|
|
|
|
/**
|
|
* The current lowest supported value of app target SDK. Applications targeting
|