commit 6098913d4b17ecee3f44bc35adfda5f24d459e87
author Fan Zhang <zhfan@google.com> Mon Aug 15 13:22:42 2016 -0700
committer Fan Zhang <zhfan@google.com> Mon Aug 15 13:24:18 2016 -0700
tree dfa4f25343fb4ca3a5634a931440e1d81f3b4a23
parent 404104a6a837845c25db35201bbc8f3967e15e15

Don't dial any number if DIAL intent is not supported.

Bug: 30868123
Change-Id: Ieb971fdd86011ef0699fdbcfec1ecce2112d0209

src/com/android/settings/dashboard/SupportItemAdapter.java

diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java
index 4ee28c6..b5c130c 100644
--- a/src/com/android/settings/dashboard/SupportItemAdapter.java
+++ b/src/com/android/settings/dashboard/SupportItemAdapter.java
@@ -450,9 +450,15 @@
                         final SupportPhone phone = mSupportFeatureProvider
                                 .getSupportPhones(mSelectedCountry, true /* isTollFree */);
                         if (phone != null) {
-                            MetricsLogger.action(mActivity,
-                                    MetricsProto.MetricsEvent.ACTION_SUPPORT_DAIL_TOLLFREE);
-                            mActivity.startActivity(phone.getDialIntent());
+                            final Intent intent = phone.getDialIntent();
+                            final boolean canDial = !mActivity.getPackageManager()
+                                    .queryIntentActivities(intent, 0)
+                                    .isEmpty();
+                            if (canDial) {
+                                MetricsLogger.action(mActivity,
+                                        MetricsProto.MetricsEvent.ACTION_SUPPORT_DAIL_TOLLFREE);
+                                mActivity.startActivity(intent);
+                            }
                         }
                         break;
                     }

src/com/android/settings/support/SupportPhoneDialogFragment.java

diff --git a/src/com/android/settings/support/SupportPhoneDialogFragment.java b/src/com/android/settings/support/SupportPhoneDialogFragment.java
index 77eb225..4dde547 100644
--- a/src/com/android/settings/support/SupportPhoneDialogFragment.java
+++ b/src/com/android/settings/support/SupportPhoneDialogFragment.java
@@ -15,9 +15,11 @@
  */
 package com.android.settings.support;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -68,9 +70,16 @@
     @Override
     public void onClick(View v) {
         final SupportPhone phone = getArguments().getParcelable(EXTRA_PHONE);
-        MetricsLogger.action(getActivity(),
-                MetricsProto.MetricsEvent.ACTION_SUPPORT_DIAL_TOLLED);
-        getActivity().startActivity(phone.getDialIntent());
+        final Activity activity = getActivity();
+        final Intent intent = phone.getDialIntent();
+        final boolean canDial = !activity.getPackageManager()
+                .queryIntentActivities(intent, 0)
+                .isEmpty();
+        if (canDial) {
+            MetricsLogger.action(getActivity(),
+                    MetricsProto.MetricsEvent.ACTION_SUPPORT_DIAL_TOLLED);
+            getActivity().startActivity(intent);
+        }
         dismiss();
     }
 }