Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cce6689 authored by Bonian Chen's avatar Bonian Chen Committed by android-build-merger
Browse files

Merge "[Help Page] Support help content under 2 CDMA SIM" into qt-qpr1-dev 

am: 20290d04

Change-Id: I0b3cb958eff31ede7daa3292987684c26e9111d5
parents 3b20d776 20290d04

src/com/android/settings/sim/SimSelectNotification.java

+4 −4
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.telephony.TelephonyManager; 
import android.util.Log;



import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.HelpTrampoline;

import com.android.settings.R;

import com.android.settings.network.SubscriptionUtil;

import com.android.settings.network.telephony.MobileNetworkActivity;
@@ -292,10 +293,9 @@ public class SimSelectNotification extends BroadcastReceiver { 
                        .setAutoCancel(true);



        // Create the pending intent that will lead to the helper page.

        Intent resultIntent = HelpUtils.getHelpIntent(

                context,

                context.getString(R.string.help_uri_sim_combination_warning),

                context.getClass().getName());

        Intent resultIntent = new Intent(context, HelpTrampoline.class);

        resultIntent.putExtra(Intent.EXTRA_TEXT, "help_uri_sim_combination_warning");



        PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent,

                PendingIntent.FLAG_CANCEL_CURRENT);

        builder.setContentIntent(resultPendingIntent);