Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KeyboxChainGenerator: fix build release parsing

Browse Source 
And return 16 by default, just as a fallback for the worst case.

Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
This commit is contained in:
Simão Gomes Viana
2025-08-07 23:13:49 +02:00
committed by Joey
parent c3edd35b29
commit cf4d7c9aef
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/com/android/internal/util/evolution/KeyboxChainGenerator.java
View File

@@ -1,5 +1,6 @@
/*
* SPDX-FileCopyrightText: 2025 Neoteric OS
* SPDX-FileCopyrightText: 2025 The halogenOS Project
* SPDX-License-Identifier: Apache-2.0
*/
package com.android.internal.util.evolution;
@@ -255,12 +256,19 @@ public final class KeyboxChainGenerator {
private static int getOsVersion() {
String release = Build.VERSION.RELEASE;
int major = 0, minor = 0, patch = 0;
int major = 16, minor = 0, patch = 0;
// Handle cases with additional suffixes like "/BP31"
release = release.split("/")[0];
String[] parts = release.split("\\.");
if (parts.length > 0) major = Integer.parseInt(parts[0]);
if (parts.length > 1) minor = Integer.parseInt(parts[1]);
if (parts.length > 2) patch = Integer.parseInt(parts[2]);
try {
if (parts.length > 0) major = Integer.parseInt(parts[0]);
if (parts.length > 1) minor = Integer.parseInt(parts[1]);
if (parts.length > 2) patch = Integer.parseInt(parts[2]);
} catch (NumberFormatException e) {
Log.w(TAG, "Unable to parse OS version: " + release);
}
return major * 10000 + minor * 100 + patch;
}