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

Remove the new task for mobile network page starts the sim onboarding

Browse Source 
Bug: 349695880
Test: manually test
Flag: EXEMPT bugfix
Change-Id: Id5f35a9311da5e47f0417a45feadb1d1a0a2e35d
This commit is contained in:
songferngwang
2024-08-12 10:48:46 +00:00
parent b21b629021
commit c537bfa8cb
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/NetworkProviderSimListController.java
View File

@@ -113,7 +113,7 @@ public class NetworkProviderSimListController extends BasePreferenceController i
if (!info.isEmbedded && !isActiveSubscriptionId
&& !SubscriptionUtil.showToggleForPhysicalSim(mSubscriptionManager)) {
SubscriptionUtil.startToggleSubscriptionDialogActivity(mContext, subId,
true);
true, false);
} else {
MobileNetworkUtils.launchMobileNetworkSettings(mContext, info);
}

5
src/com/android/settings/network/SimOnboardingActivity.kt
View File

@@ -588,11 +588,14 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
fun startSimOnboardingActivity(
context: Context,
subId: Int,
isNewTask: Boolean = false,
) {
val intent = Intent(context, SimOnboardingActivity::class.java).apply {
putExtra(SUB_ID, subId)
if(isNewTask) {
setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
}
}
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
context.startActivity(intent)
}

12
src/com/android/settings/network/SubscriptionUtil.java
View File

@@ -24,6 +24,7 @@ import static android.telephony.UiccSlotInfo.CARD_STATE_INFO_PRESENT;
import static com.android.internal.util.CollectionUtils.emptyIfNull;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.ConnectivityManager;
import android.net.NetworkCapabilities;
@@ -515,18 +516,23 @@ public class SubscriptionUtil {
* @param context {@code Context}
* @param subId The id of subscription need to be enabled or disabled.
* @param enable Whether the subscription with {@code subId} should be enabled or disabled.
* @param isNewTask Whether the start activity add the new task or not
*/
public static void startToggleSubscriptionDialogActivity(
Context context, int subId, boolean enable) {
Context context, int subId, boolean enable, boolean isNewTask) {
if (!SubscriptionManager.isUsableSubscriptionId(subId)) {
Log.i(TAG, "Unable to toggle subscription due to invalid subscription ID.");
return;
}
if (enable && Flags.isDualSimOnboardingEnabled()) {
SimOnboardingActivity.startSimOnboardingActivity(context, subId);
SimOnboardingActivity.startSimOnboardingActivity(context, subId, isNewTask);
return;
}
context.startActivity(ToggleSubscriptionDialogActivity.getIntent(context, subId, enable));
Intent intent = ToggleSubscriptionDialogActivity.getIntent(context, subId, enable);
if (isNewTask) {
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
context.startActivity(intent);
}
/**

1
src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
View File

@@ -76,7 +76,6 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
Intent intent = new Intent(context, ToggleSubscriptionDialogActivity.class);
intent.putExtra(ARG_SUB_ID, subId);
intent.putExtra(ARG_enable, enable);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
return intent;
}

2
src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
View File

@@ -410,7 +410,7 @@ public class SimSlotChangeHandler {
return;
}
Log.d(TAG, "Start ToggleSubscriptionDialogActivity with " + subId + " under DSDS+Mep.");
SubscriptionUtil.startToggleSubscriptionDialogActivity(mContext, subId, true);
SubscriptionUtil.startToggleSubscriptionDialogActivity(mContext, subId, true, true);
}
private boolean isMultipleEnabledProfilesSupported() {