commit ecee72d15e3d400af2d7f89808dba7a56ed08a37
author Baligh Uddin <baligh@google.com> Tue Dec 17 17:31:03 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 17 17:31:04 2013 +0000
tree f2402abf730b720d700e2c520eb6425029a16e27
parent 17bf9338f6fa42bc3d5d758ded73693380d8281c
parent 26bfaefa84f66e9e72b9fa30f26172083aaea4dd

Merge "Import translations. DO NOT MERGE"

src/com/android/settings/SecuritySettings.java

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 45c36ac..f75480b 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -234,8 +234,10 @@
                     (PreferenceGroup) root.findPreference(KEY_SECURITY_CATEGORY);
 
             if (securityCategory != null) {
-                securityCategory.removePreference(
-                        root.findPreference(KEY_NFC_UNLOCK_SET_OR_CHANGE));
+                Preference preference = root.findPreference(KEY_NFC_UNLOCK_SET_OR_CHANGE);
+                if (preference != null) {
+                    securityCategory.removePreference(preference);
+                }
             }
         }
 

src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java

diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index f097fd6..db473f8 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -168,8 +168,8 @@
                         .setPositiveButton(android.R.string.ok, this)
                         .setNegativeButton(android.R.string.cancel, this)
                         .create();
-                ad.getButton(AlertDialog.BUTTON_POSITIVE)
-                        .setFilterTouchesWhenObscured(true);
+                ad.create();
+                ad.getButton(AlertDialog.BUTTON_POSITIVE).setFilterTouchesWhenObscured(true);
                 return ad;
             }
             case DIALOG_ID_DISABLE_WARNING: {