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

Merge "Reland: Rework platform version to hide codenames."

Browse Source
This commit is contained in:
Narayan Kamath
2020-02-06 10:51:15 +00:00
committed by Android (Google) Code Review
parent af5dfc2f51 db0074542c
commit 85e2378965
8 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -35687,6 +35687,7 @@ package android.os {
field public static final String INCREMENTAL;
field public static final int PREVIEW_SDK_INT;
field public static final String RELEASE;
field @NonNull public static final String RELEASE_OR_CODENAME;
field @Deprecated public static final String SDK;
field public static final int SDK_INT;
field public static final String SECURITY_PATCH;

7
core/java/android/os/Build.java
View File

@@ -239,6 +239,13 @@ public class Build {
*/
public static final String RELEASE = getString("ro.build.version.release");
/**
* The version string we show to the user; may be {@link #RELEASE} or
* {@link #CODENAME} if not a final release build.
*/
@NonNull public static final String RELEASE_OR_CODENAME = getString(
"ro.build.version.release_or_codename");
/**
* The base OS build the product is based on.
*/

2
core/java/com/android/internal/os/RuntimeInit.java
View File

@@ -323,7 +323,7 @@ public class RuntimeInit {
result.append(System.getProperty("java.vm.version")); // such as 1.1.0
result.append(" (Linux; U; Android ");
String version = Build.VERSION.RELEASE; // "1.0" or "3.4b5"
String version = Build.VERSION.RELEASE_OR_CODENAME; // "1.0" or "3.4b5"
result.append(version.length() > 0 ? version : "1.0");
// add the model for the release build

2
core/tests/coretests/src/android/os/BuildTest.java
View File

@@ -60,7 +60,7 @@ public class BuildTest extends TestCase {
assertNotEmpty("BRAND", Build.BRAND);
assertNotEmpty("MODEL", Build.MODEL);
assertNotEmpty("VERSION.INCREMENTAL", Build.VERSION.INCREMENTAL);
assertNotEmpty("VERSION.RELEASE", Build.VERSION.RELEASE);
assertNotEmpty("VERSION.RELEASE", Build.VERSION.RELEASE_OR_CODENAME);
assertNotEmpty("TYPE", Build.TYPE);
Assert.assertNotNull("TAGS", Build.TAGS); // TAGS is allowed to be empty.
assertNotEmpty("FINGERPRINT", Build.FINGERPRINT);

2
packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java
View File

@@ -169,7 +169,7 @@ public class QSFooterImpl extends FrameLayout implements QSFooter,
if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)) {
v.setText(mContext.getString(
com.android.internal.R.string.bugreport_status,
Build.VERSION.RELEASE,
Build.VERSION.RELEASE_OR_CODENAME,
Build.ID));
v.setVisibility(View.VISIBLE);
} else {

2
packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java
View File

@@ -158,7 +158,7 @@ public class DemoModeFragment extends PreferenceFragment implements OnPreference
String demoTime = "1010"; // 10:10, a classic choice of horologists
try {
String[] versionParts = android.os.Build.VERSION.RELEASE.split("\\.");
String[] versionParts = android.os.Build.VERSION.RELEASE_OR_CODENAME.split("\\.");
int majorVersion = Integer.valueOf(versionParts[0]);
demoTime = String.format("%02d00", majorVersion % 24);
} catch (IllegalArgumentException ex) {

2
services/core/java/com/android/server/policy/LegacyGlobalActions.java
View File

@@ -402,7 +402,7 @@ class LegacyGlobalActions implements DialogInterface.OnDismissListener, DialogIn
public String getStatus() {
return mContext.getString(
com.android.internal.R.string.bugreport_status,
Build.VERSION.RELEASE,
Build.VERSION.RELEASE_OR_CODENAME,
Build.ID);
}
}

2
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
View File

@@ -2480,7 +2480,7 @@ public class StatsPullAtomService extends SystemService {
.writeString(Build.BRAND)
.writeString(Build.PRODUCT)
.writeString(Build.DEVICE)
.writeString(Build.VERSION.RELEASE)
.writeString(Build.VERSION.RELEASE_OR_CODENAME)
.writeString(Build.ID)
.writeString(Build.VERSION.INCREMENTAL)
.writeString(Build.TYPE)