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

Commit a40bf2ae authored by Kevin Lau Fang's avatar Kevin Lau Fang Committed by Android (Google) Code Review
Browse files

Merge "Revert submission"

parents c79756a8 40dd1e21

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_OR_CODENAME))

                            Build.VERSION.RELEASE))

                    .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_OR_CODENAME;

        return Build.VERSION.RELEASE;

    }



    @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_OR_CODENAME;

        return Build.VERSION.RELEASE;

    }

}

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_OR_CODENAME);

                Build.VERSION.RELEASE);

        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_OR_CODENAME);

        assertThat(mController.getSummary()).isEqualTo(Build.VERSION.RELEASE);

    }



    @Test