commit db6b87e75d2f7a2a929b085e9514acb137157a47
author Pengquan Meng <mpq@google.com> Tue Jun 18 17:42:16 2019 -0700
committer Pengquan Meng <mpq@google.com> Tue Jun 18 18:00:53 2019 -0700
tree 5169f268d762df8f2989fa7b814f9b64b3b9bbe5
parent 441122662351a16c42c7a0213352d5baebc29a33

Update mobile network settings config package/class

This update the mobile network setting package/class config value.
1. mobile_network_settings_package
2. mobile_network_settings_class

This also change the open activity for VideoCalling setting/Supp Service
Dialog from old page to the new page in settings app.

Bug: 135492605
Test: manual test
Change-Id: Ida9ad48d4b63c774a0dc337e3b2a0b87ed7cdaff

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index f2438d9..26ae699 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -19,6 +19,7 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -70,9 +71,7 @@
  * is from the package com.android.contacts.
  *
  * For the "Mobile network settings" screen under the main Settings app,
- * See {@link MobileNetworkSettings}.
- *
- * @see com.android.phone.MobileNetworkSettings
+ * See {@link com.android.settings.network.telephony.MobileNetworkActivity}.
  */
 public class CallFeaturesSetting extends PreferenceActivity
         implements Preference.OnPreferenceChangeListener {
@@ -174,8 +173,12 @@
                         new Dialog.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                startActivity(new Intent(mPhone.getContext(),
-                                        com.android.phone.MobileNetworkSettings.class));
+                                Intent intent = new Intent(Intent.ACTION_MAIN);
+                                ComponentName mobileNetworkSettingsComponent = new ComponentName(
+                                        getString(R.string.mobile_network_settings_package),
+                                        getString(R.string.mobile_network_settings_class));
+                                intent.setComponent(mobileNetworkSettingsComponent);
+                                startActivity(intent);
                             }
                         };
                 builder.setMessage(getResources().getString(

src/com/android/phone/settings/SuppServicesUiUtil.java

diff --git a/src/com/android/phone/settings/SuppServicesUiUtil.java b/src/com/android/phone/settings/SuppServicesUiUtil.java
index 8cb37a5..d508d9c 100644
--- a/src/com/android/phone/settings/SuppServicesUiUtil.java
+++ b/src/com/android/phone/settings/SuppServicesUiUtil.java
@@ -18,6 +18,7 @@
 
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -66,8 +67,12 @@
                 new Dialog.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        context.startActivity(new Intent(context,
-                                com.android.phone.MobileNetworkSettings.class));
+                        Intent intent = new Intent(Intent.ACTION_MAIN);
+                        ComponentName mobileNetworkSettingsComponent = new ComponentName(
+                                context.getString(R.string.mobile_network_settings_package),
+                                context.getString(R.string.mobile_network_settings_class));
+                        intent.setComponent(mobileNetworkSettingsComponent);
+                        context.startActivity(intent);
                     }
                 };
         return builder.setMessage(message)