Suspend action in security patch when browser is disabled am: 013da34209 am: 221b9157b4

am: ac49ccedb7

Change-Id: Ib4458b25bb12a928a9a258b2430877ca75a18f78

diff --cc src/com/android/settings/DeviceInfoSettings.java
index 3305b98,de62f92..5808219
--- 1/src/com/android/settings/DeviceInfoSettings.java
--- 2/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@@ -265,10 -277,23 +265,17 @@@ public class DeviceInfoSettings extend
                          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)) {
 -            CarrierConfigManager configManager =
 -                    (CarrierConfigManager) getSystemService(Context.CARRIER_CONFIG_SERVICE);
 -            PersistableBundle b = configManager.getConfig();
 -            if (b != null && b.getBoolean(CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_BOOL)) {
 -                ciActionOnSysUpdate(b);
 -            }
          }
 +        mSystemUpdatePreferenceController.handlePreferenceTreeClick(preference);
          return super.onPreferenceTreeClick(preference);
      }