From ebf46ecf0f9173f6ad65157dff175b90e80af8fb Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Mon, 28 Oct 2019 16:33:10 -0700 Subject: [PATCH] Rework platform version to hide codenames. The public platform version no longer can be a codename, it is always the most recently released platform. A new build property and API provides either the offical version or the current codename as appropriate. This will avoid breaking apps that look at the platform version while development is under a codename. Bug: 143175463 Test: manual Change-Id: I9cc55fa3d5cee2606ea634d3926d957990694908 --- .../com/android/commands/monkey/MonkeySourceNetworkVars.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java index 9abfe265b..67cce2298 100644 --- a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java +++ b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java @@ -77,7 +77,7 @@ public class MonkeySourceNetworkVars { VAR_MAP.put("build.cpu_abi", new StaticVarGetter(Build.CPU_ABI)); VAR_MAP.put("build.manufacturer", new StaticVarGetter(Build.MANUFACTURER)); VAR_MAP.put("build.version.incremental", new StaticVarGetter(Build.VERSION.INCREMENTAL)); - VAR_MAP.put("build.version.release", new StaticVarGetter(Build.VERSION.RELEASE)); + VAR_MAP.put("build.version.release", new StaticVarGetter(Build.VERSION.RELEASE_OR_CODENAME)); VAR_MAP.put("build.version.sdk", new StaticVarGetter(Integer.toString(Build.VERSION.SDK_INT))); VAR_MAP.put("build.version.codename", new StaticVarGetter(Build.VERSION.CODENAME));