From 013da34209877ed2d1169a860a72ee776f978fd0 Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Fri, 14 Oct 2016 13:53:14 -0700 Subject: [PATCH] Suspend action in security patch when browser is disabled When queryIntentActivities(intent, flag) return empty, don't send out that intent to stop crash. This is a special catch only in security patch. Bug: 32054067 Test: Manual, hard to mock the situation to disable all the apps for a specific action. Change-Id: Ibc96b814a4170926972cff8e0bc954ea57b33c10 --- src/com/android/settings/DeviceInfoSettings.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index dd8064fb45..de62f92ae3 100644 --- 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)) { -- 2.11.0