Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95108c4b authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Narayan Kamath
Browse files

Reland: 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
Exempt-From-Owner-Approval: Previously approved, no new changes.
Change-Id: Ifb6f6236aab2c40fd51abb9c6587eafcc8983857
parent 21276e72

src/com/android/settings/deviceinfo/PrivateVolumeSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -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();

        }

src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public class FirmwareVersionDetailPreferenceController extends BasePreferenceCon 


    @Override

    public CharSequence getSummary() {

        return Build.VERSION.RELEASE;

        return Build.VERSION.RELEASE_OR_CODENAME;

    }



    @Override

src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ public class FirmwareVersionPreferenceController extends BasePreferenceControlle 


    @Override

    public CharSequence getSummary() {

        return Build.VERSION.RELEASE;

        return Build.VERSION.RELEASE_OR_CODENAME;

    }

}

src/com/android/settings/system/SystemUpdatePreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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<Bundle> bundleFutureTask = new FutureTask<>(

                // Put the API call in a future to avoid StrictMode violation.

                () -> mUpdateManager.retrieveSystemUpdateInfo());

tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDetailPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,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