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

Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20

Browse Source 
Change-Id: Idf87ba7845ed12d1445498f4370d32837801327a
This commit is contained in:
TreeHugger Robot
2020-05-07 19:59:53 +00:00
committed by Automerger Merge Worker
parent 6b2291f1cc 5625958a20
commit 7b0f05bc69
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
View File

@@ -24,6 +24,7 @@ import android.os.UserManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.internal.telephony.CellBroadcastUtils;
import com.android.settings.accounts.AccountRestrictionHelper;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedPreference;
@@ -88,7 +89,9 @@ public class EmergencyBroadcastPreferenceController extends AbstractPreferenceCo
com.android.internal.R.bool.config_cellBroadcastAppLinks);
if (enabled) {
try {
if (mPm.getApplicationEnabledSetting("com.android.cellbroadcastreceiver")
String packageName = CellBroadcastUtils
.getDefaultCellBroadcastReceiverPackageName(mContext);
if (packageName == null || mPm.getApplicationEnabledSetting(packageName)
== PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
enabled = false; // CMAS app disabled
}