Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev

2016-10-18 16:45:35 +00:00
parent 37c5dd0fe3 013da34209
commit 7fee46383f
1 changed files with 7 additions and 0 deletions
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -277,6 +277,13 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
                        Toast.LENGTH_LONG);
                mDevHitToast.show();
            }
+        } else if (preference.getKey().equals(KEY_SECURITY_PATCH)) {
+            if (getPackageManager().queryIntentActivities(preference.getIntent(), 0).isEmpty()) {
+                // Don't send out the intent to stop crash
+                Log.w(LOG_TAG, "Stop click action on " + KEY_SECURITY_PATCH + ": "
+                        + "queryIntentActivities() returns empty" );
+                return true;
+            }
        } else if (preference.getKey().equals(KEY_DEVICE_FEEDBACK)) {
            sendFeedback();
        } else if(preference.getKey().equals(KEY_SYSTEM_UPDATE_SETTINGS)) {