From 04bcb42d9cc659bb7a2c6e6f2ef076d19bdba1d1 Mon Sep 17 00:00:00 2001
From: mavishsu <mavishsu@google.com>
Date: Tue, 22 Jan 2019 12:42:52 +0800
Subject: [PATCH] Add Subscription ID to extra when start carrier settings
 activity.

Bug: 123325237
Test: Manual test
Change-Id: I48cda996bca699e97866ae0d1b7221266cf38df2
---
 .../network/telephony/CarrierPreferenceController.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/network/telephony/CarrierPreferenceController.java b/src/com/android/settings/network/telephony/CarrierPreferenceController.java
index 3dab15e2a36..fbbfb9e88b2 100644
--- a/src/com/android/settings/network/telephony/CarrierPreferenceController.java
+++ b/src/com/android/settings/network/telephony/CarrierPreferenceController.java
@@ -16,8 +16,8 @@
 
 package com.android.settings.network.telephony;
 
-import android.content.Context;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
@@ -41,7 +41,6 @@ public class CarrierPreferenceController extends BasePreferenceController {
 
     public CarrierPreferenceController(Context context, String key) {
         super(context, key);
-        mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
         mCarrierConfigManager = new CarrierConfigManager(context);
         mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
     }
@@ -88,6 +87,7 @@ public class CarrierPreferenceController extends BasePreferenceController {
         final Intent intent = new Intent(Intent.ACTION_MAIN);
         intent.setComponent(cn);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subId);
 
         final PackageManager pm = mContext.getPackageManager();
         final ResolveInfo resolveInfo = pm.resolveActivity(intent, 0 /* flags */);