From cdbc0dfa6a065253f3031ecab9ef03402de48ab2 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Mon, 28 Oct 2019 16:36:15 -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: I711ca20c4c8ce389697e940696051a336f5fd808 --- src/com/android/settings/deviceinfo/PrivateVolumeSettings.java | 2 +- .../FirmwareVersionDetailPreferenceController.java | 2 +- .../firmwareversion/FirmwareVersionPreferenceController.java | 2 +- .../settings/system/SystemUpdatePreferenceController.java | 2 +- .../FirmwareVersionDetailPreferenceControllerTest.java | 2 +- .../FirmwareVersionPreferenceControllerTest.java | 2 +- .../settings/system/SystemUpdatePreferenceControllerTest.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java index 8e6158ba233..08d6ca462b4 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java @@ -737,7 +737,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { public Dialog onCreateDialog(Bundle savedInstanceState) { return new AlertDialog.Builder(getActivity()) .setMessage(getContext().getString(R.string.storage_detail_dialog_system, - Build.VERSION.RELEASE)) + Build.VERSION.RELEASE_OR_CODENAME)) .setPositiveButton(android.R.string.ok, null) .create(); } diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java index daa10d26965..5b975efd1c3 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java @@ -70,7 +70,7 @@ public class FirmwareVersionDetailPreferenceController extends BasePreferenceCon @Override public CharSequence getSummary() { - return Build.VERSION.RELEASE; + return Build.VERSION.RELEASE_OR_CODENAME; } @Override diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java index 41d9566760c..dcff4c328c1 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java @@ -34,6 +34,6 @@ public class FirmwareVersionPreferenceController extends BasePreferenceControlle @Override public CharSequence getSummary() { - return Build.VERSION.RELEASE; + return Build.VERSION.RELEASE_OR_CODENAME; } } diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java index 38a88b95439..92819d6ddf3 100644 --- a/src/com/android/settings/system/SystemUpdatePreferenceController.java +++ b/src/com/android/settings/system/SystemUpdatePreferenceController.java @@ -89,7 +89,7 @@ public class SystemUpdatePreferenceController extends BasePreferenceController { @Override public CharSequence getSummary() { CharSequence summary = mContext.getString(R.string.android_version_summary, - Build.VERSION.RELEASE); + Build.VERSION.RELEASE_OR_CODENAME); final FutureTask bundleFutureTask = new FutureTask<>( // Put the API call in a future to avoid StrictMode violation. () -> mUpdateManager.retrieveSystemUpdateInfo()); diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceControllerTest.java index adfff25bfb7..0d0d6f3e7b8 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceControllerTest.java @@ -64,7 +64,7 @@ public class FirmwareVersionDetailPreferenceControllerTest { @Test public void getSummary_shouldGetBuildVersion() { - assertThat(mController.getSummary()).isEqualTo(Build.VERSION.RELEASE); + assertThat(mController.getSummary()).isEqualTo(Build.VERSION.RELEASE_OR_CODENAME); } @Test diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java index 77ae4e2589b..4306955170b 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java @@ -65,6 +65,6 @@ public class FirmwareVersionPreferenceControllerTest { public void updatePreference_shouldSetSummaryToBuildNumber() { mController.updateState(mPreference); - assertThat(mPreference.getSummary()).isEqualTo(Build.VERSION.RELEASE); + assertThat(mPreference.getSummary()).isEqualTo(Build.VERSION.RELEASE_OR_CODENAME); } } diff --git a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java index fbd87c96f5f..95c95bb929e 100644 --- a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java @@ -139,7 +139,7 @@ public class SystemUpdatePreferenceControllerTest { assertThat(mPreference.getSummary()) .isEqualTo(mContext.getString(R.string.android_version_summary, - Build.VERSION.RELEASE)); + Build.VERSION.RELEASE_OR_CODENAME)); } @Test