Merge "integrate config_disable_all_cb_messages to settings" into sc-dev am: ed23483ca7 am: 9cfc1d747e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14669209

Change-Id: I621b0892368bdb836b1992a2110a7b2965496630
This commit is contained in:
Chen Xu
2021-05-22 00:07:44 +00:00
committed by Automerger Merge Worker

View File

@@ -86,7 +86,11 @@ public class EmergencyBroadcastPreferenceController extends AbstractPreferenceCo
private boolean isCellBroadcastAppLinkEnabled() { private boolean isCellBroadcastAppLinkEnabled() {
// Enable link to CMAS app settings depending on the value in config.xml. // Enable link to CMAS app settings depending on the value in config.xml.
boolean enabled = mContext.getResources().getBoolean( boolean enabled = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_cellBroadcastAppLinks); com.android.internal.R.bool.config_cellBroadcastAppLinks) &&
// For data-only tablet devices which need to not forwarding any WEA-alert and hide from
// settings menu.
!mContext.getResources().getBoolean(
com.android.internal.R.bool.config_disable_all_cb_messages);
if (enabled) { if (enabled) {
try { try {
String packageName = CellBroadcastUtils String packageName = CellBroadcastUtils