diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index eb9669b..5233911 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -92,9 +92,6 @@
 
 public class MobileNetworkSettings extends Activity  {
 
-    /** @hide */
-    public static final String EXTRA_SUB_ID = "extra_sub_id";
-
     private enum TabState {
         NO_TABS, UPDATE, DO_NOTHING
     }
@@ -456,7 +453,7 @@
             Bundle data = intent.getExtras();
             int subId = -1;
             if (data != null) {
-                subId = data.getInt(EXTRA_SUB_ID, -1);
+                subId = data.getInt(Settings.EXTRA_SUB_ID, -1);
             }
             return SubscriptionManager.getSlotIndex(subId);
         }
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 8365ec7..b50ab39 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -36,6 +36,7 @@
 import android.os.UserManager;
 import android.preference.PreferenceManager;
 import android.provider.ContactsContract.PhoneLookup;
+import android.provider.Settings;
 import android.telecom.DefaultDialerManager;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
@@ -45,7 +46,6 @@
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
-import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.ArrayMap;
@@ -523,7 +523,7 @@
 
         // "Mobile network settings" screen / dialog
         Intent intent = new Intent(mContext, com.android.phone.MobileNetworkSettings.class);
-        intent.putExtra(MobileNetworkSettings.EXTRA_SUB_ID, subId);
+        intent.putExtra(Settings.EXTRA_SUB_ID, subId);
         intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         PendingIntent contentIntent = PendingIntent.getActivity(mContext, subId, intent, 0);