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
28 lines
918 B
Diff
28 lines
918 B
Diff
From c7e460bb19071d867cd7ca04282ce42694f4f358 Mon Sep 17 00:00:00 2001
|
|
From: Alex Buynytskyy <alexbuy@google.com>
|
|
Date: Wed, 12 Apr 2023 01:06:26 +0000
|
|
Subject: [PATCH] Revert "Don't force +1 for resource resolution."
|
|
|
|
It's not required for master.
|
|
|
|
This reverts commit f1cb683988f81579a76ddbf9993848a4a06dd28c.
|
|
|
|
Bug: 277674088
|
|
Test: boots, no crashes
|
|
Change-Id: Ia1692548f26496fdc6f1e4f0557213c7996d6823
|
|
---
|
|
|
|
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
|
|
index 4d3e92b..eb47170 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;
|
|
+ public static final int RESOURCES_SDK_INT = SDK_INT + ACTIVE_CODENAMES.length;
|
|
|
|
/**
|
|
* The current lowest supported value of app target SDK. Applications targeting
|