From fd351eaaf11f90afdcbb65401e75ecd49115dc30 Mon Sep 17 00:00:00 2001
From: Geoffrey Pitsch <gpitsch@google.com>
Date: Tue, 16 Aug 2016 14:34:38 -0400
Subject: [PATCH] Only show BootSounds preference if has_boot_sounds is true.

Defaults to false, to be overridden in device values.

Bug:30888962
Change-Id: I563b15b793f1a214598bb7b5a3d9dc9cf3af0d10
---
 res/values/bools.xml                                   |  6 ++++--
 .../settings/notification/OtherSoundSettings.java      | 10 +++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/res/values/bools.xml b/res/values/bools.xml
index 8958a6e0d86..71923ea5f39 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,6 +17,8 @@
 <resources>
     <!-- Whether or not the dock settings are to be displayed for this device when docked -->
     <bool name="has_dock_settings">false</bool>
+    <!-- Whether there is a boot sounds checkbox -->
+    <bool name="has_boot_sounds">false</bool>
     <!-- Whether there is a silent mode checkbox  -->
     <bool name="has_silent_mode">true</bool>
     <!-- Whether the DEPRECATED power control widget is enabled for this
diff --git a/src/com/android/settings/notification/OtherSoundSettings.java b/src/com/android/settings/notification/OtherSoundSettings.java
index c538a7be0fc..5fdb83a6127 100644
--- a/src/com/android/settings/notification/OtherSoundSettings.java
+++ b/src/com/android/settings/notification/OtherSoundSettings.java
@@ -209,8 +209,12 @@ public class OtherSoundSettings extends SettingsPreferenceFragment implements In
             pref.init(this);
         }
 
-        mBootSounds = (SwitchPreference) findPreference(KEY_BOOT_SOUNDS);
-        mBootSounds.setChecked(SystemProperties.getBoolean(PROPERTY_BOOT_SOUNDS, true));
+        if (mContext.getResources().getBoolean(R.bool.has_boot_sounds)) {
+            mBootSounds = (SwitchPreference) findPreference(KEY_BOOT_SOUNDS);
+            mBootSounds.setChecked(SystemProperties.getBoolean(PROPERTY_BOOT_SOUNDS, true));
+        } else {
+            removePreference(KEY_BOOT_SOUNDS);
+        }
     }
 
     @Override
@@ -227,7 +231,7 @@ public class OtherSoundSettings extends SettingsPreferenceFragment implements In
 
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
-        if (preference == mBootSounds) {
+        if (mBootSounds != null && preference == mBootSounds) {
             SystemProperties.set(PROPERTY_BOOT_SOUNDS, mBootSounds.isChecked() ? "1" : "0");
             return false;
         } else {