PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Subscription ID to extra when start carrier settings activity.

Browse Source 
Bug: 123325237
Test: Manual test
Change-Id: I48cda996bca699e97866ae0d1b7221266cf38df2
This commit is contained in:
mavishsu
2019-01-22 12:42:52 +08:00
parent d8b3fd3869
commit 04bcb42d9c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/network/telephony/CarrierPreferenceController.java
View File

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