commit fb32790adc9ed647ad4e77c9613a860f9b76e855
author Sanket Padawe <sanketpadawe@google.com> Tue Jun 02 23:04:23 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 02 23:04:24 2015 +0000
tree 7d3b599e4d415838d653f140d3e82f01300f5125
parent 6a05116804c9b849bf3aa634df3e90cc216abc88
parent 0da0573b7015f76c0fd5563bbba594ba3219f548

Merge "Fix Bluetooth device Settings checkbox issue on clicking "Input device"" into mnc-dev

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 25adef1..3cef9ce 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -607,17 +607,14 @@
                     1 /* one home activity by default */);
         } else {
             if (!mIsShowingDashboard) {
-                // Search is shown we are launched thru a Settings "shortcut". UP will be shown
-                // only if it is a sub settings
+                mDisplaySearch = false;
+                // UP will be shown only if it is a sub settings
                 if (mIsShortcut) {
                     mDisplayHomeAsUpEnabled = isSubSettings;
-                    mDisplaySearch = false;
                 } else if (isSubSettings) {
                     mDisplayHomeAsUpEnabled = true;
-                    mDisplaySearch = true;
                 } else {
                     mDisplayHomeAsUpEnabled = false;
-                    mDisplaySearch = false;
                 }
                 setTitleFromIntent(intent);
 

src/com/android/settings/applications/DefaultEmergencyPreference.java

diff --git a/src/com/android/settings/applications/DefaultEmergencyPreference.java b/src/com/android/settings/applications/DefaultEmergencyPreference.java
index 2bda0ed..0062625 100644
--- a/src/com/android/settings/applications/DefaultEmergencyPreference.java
+++ b/src/com/android/settings/applications/DefaultEmergencyPreference.java
@@ -139,7 +139,8 @@
     }
 
     public static boolean isCapable(Context context) {
-        return context.getResources().getBoolean(
+        return TelephonyManager.EMERGENCY_ASSISTANCE_ENABLED
+                && context.getResources().getBoolean(
                 com.android.internal.R.bool.config_voice_capable);
     }