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

[Help Page] Support help content under 2 CDMA SIM

Browse Source 
Fix the design for displaying help content.

Launch help content from notification (PendingIntent) could not be resolved correctly.
Route through HelpTrampoline to fix it.

Bug: 139040358
Test: Manual with fake from framework side for dual CDMA SIM
Change-Id: Iff3a6e9095c3908b3c5b1a25e2535bcab1858ae2
This commit is contained in:
Bonian Chen
2019-09-11 14:35:15 +08:00
parent 1ae748b09f
commit fad5a00b84
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/sim/SimSelectNotification.java
View File

@@ -46,6 +46,7 @@ import android.telephony.TelephonyManager;
import android.util.Log; import android.util.Log;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.HelpTrampoline;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.network.SubscriptionUtil; import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.telephony.MobileNetworkActivity; import com.android.settings.network.telephony.MobileNetworkActivity;
@@ -292,10 +293,9 @@ public class SimSelectNotification extends BroadcastReceiver {
.setAutoCancel(true); .setAutoCancel(true);
// Create the pending intent that will lead to the helper page. // Create the pending intent that will lead to the helper page.
Intent resultIntent = HelpUtils.getHelpIntent( Intent resultIntent = new Intent(context, HelpTrampoline.class);
context, resultIntent.putExtra(Intent.EXTRA_TEXT, "help_uri_sim_combination_warning");
context.getString(R.string.help_uri_sim_combination_warning),
context.getClass().getName());
PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent, PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent,
PendingIntent.FLAG_CANCEL_CURRENT); PendingIntent.FLAG_CANCEL_CURRENT);
builder.setContentIntent(resultPendingIntent); builder.setContentIntent(resultPendingIntent);