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

Commit ec5f9b1a authored by Amit Mahajan's avatar Amit Mahajan Committed by Automerger Merge Worker
Browse files

Merge "Remove hard-coding cellbroadcastreceiver package name." into... 

Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-d1-dev-plus-aosp am: fb93e94d

Change-Id: I77a5fe0cabed8e5934ec42b4ae0c8476c19163ac
parents 411e488c fb93e94d

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -7312,6 +7312,9 @@ 
    <!-- Summary of multimedia messaging service settings.  [CHAR LIMIT=100] -->

    <string name="mms_message_summary">Send &amp; receive when mobile data is off</string>









    <!-- Cell broacast receiver package name [DO NOT TRANSLATE] -->









    <string name="cell_broadcast_receiver_package">com.android.cellbroadcastreceiver</string>

















    <!-- Title of a preference for whether to allow data during calls that is shown when mobile









         data is turned off. This is needed for some multi-SIM scenarios, because the SIM that is









         default for data might not be available during a phone call. [CHAR LIMIT=60] -->

























res/xml/app_and_notification.xml



+1
−1






























Original line number
Diff line number
Diff line







@@ -82,7 +82,7 @@







        settings:useAdminDisabledSummary="true">









        <intent









            android:action="android.intent.action.MAIN"









            android:targetPackage="com.android.cellbroadcastreceiver"









            android:targetPackage="@string/cell_broadcast_receiver_package"









            android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>









    </com.android.settingslib.RestrictedPreference>










































src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java



+4
−1






























Original line number
Diff line number
Diff line







@@ -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









                }