commit 792bf3288663f276dfd48353497fe9362d7c505b
author jackqdyulei <jackqdyulei@google.com> Tue Oct 18 17:13:34 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 18 17:13:34 2016 +0000
tree d0005dd158b901a3e82eaf504c57cc4e94761f78
parent 58b9b141678e94cbe1adeafc2f807aca764b7825
parent ac49ccedb7f3315db7d73d8e3dca69a341cb23ed

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

Change-Id: Ib4458b25bb12a928a9a258b2430877ca75a18f78

src/com/android/settings/DeviceInfoSettings.java

diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 3305b98..5808219 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -265,6 +265,13 @@
                         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();
         }