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

Commit cdf01bb1 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Rework platform version to hide codenames."

parents a9968d58 cdbc0dfa

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
@@ -70,7 +70,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
@@ -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