--- a/packages/apps/Settings/res/xml/my_device_info.xml
+++ b/packages/apps/Settings/res/xml/my_device_info.xml
@@ -123,13 +123,13 @@
settings:controller="com.android.settings.deviceinfo.imei.ImeiInfoPreferenceController"/>
<!-- Android version -->
- <Preference
+ <!--<Preference
android:key="firmware_version"
android:order="42"
android:title="@string/firmware_version"
android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings"
- settings:controller="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController"/>
+ settings:controller="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController"/>-->
</PreferenceCategory>
<PreferenceCategory
diff --git a/packages/apps/Settings/src/com/android/settings/core/gateway/SettingsGateway.java b/packages/apps/Settings/src/com/android/settings/core/gateway/SettingsGateway.java
index bf7f4423bf..b1056128a3 100644
--- a/packages/apps/Settings/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/packages/apps/Settings/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -206,7 +206,7 @@ public class SettingsGateway {
MyDeviceInfoFragment.class.getName(),
ModuleLicensesDashboard.class.getName(),
ManageApplications.class.getName(),
- FirmwareVersionSettings.class.getName(),
+ //FirmwareVersionSettings.class.getName(),
ManageAssist.class.getName(),
ProcessStatsUi.class.getName(),