Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev (7fee4638) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/DeviceInfoSettings.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -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)) {