commit 236e67ce79d04634061658c1f57610723d4a0001
author Jeff Sharkey <jsharkey@android.com> Wed Apr 16 17:21:29 2014 -0700
committer Jeff Sharkey <jsharkey@android.com> Mon Apr 28 08:55:25 2014 -0700
tree 99f2496999c66fd983377238826ba2ce5de12d7e
parent 0d085404af53e47b2bb193102d0f1a6c07ba8797

Allow OEM to provide regulatory info.

Relaxing the component name allows an OEM app to provide the
regulatory info.

Bug: 13340779
Change-Id: If1aedec07e2d4136332eaffad98e5a790bd10dd4

src/com/android/phone/SpecialCharSequenceMgr.java

diff --git a/src/com/android/phone/SpecialCharSequenceMgr.java b/src/com/android/phone/SpecialCharSequenceMgr.java
index 9b5373c..c29769f 100644
--- a/src/com/android/phone/SpecialCharSequenceMgr.java
+++ b/src/com/android/phone/SpecialCharSequenceMgr.java
@@ -23,8 +23,11 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.provider.Settings;
+
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.Phone;
+
 import android.telephony.PhoneNumberUtils;
 import android.util.Log;
 import android.view.WindowManager;
@@ -243,10 +246,7 @@
     private static boolean handleRegulatoryInfoDisplay(Context context, String input) {
         if (input.equals(MMI_REGULATORY_INFO_DISPLAY)) {
             log("handleRegulatoryInfoDisplay() sending intent to settings app");
-            ComponentName regInfoDisplayActivity = new ComponentName(
-                    "com.android.settings", "com.android.settings.RegulatoryInfoDisplayActivity");
-            Intent showRegInfoIntent = new Intent("android.settings.SHOW_REGULATORY_INFO");
-            showRegInfoIntent.setComponent(regInfoDisplayActivity);
+            Intent showRegInfoIntent = new Intent(Settings.ACTION_SHOW_REGULATORY_INFO);
             try {
                 context.startActivity(showRegInfoIntent);
             } catch (ActivityNotFoundException e) {