Snap for 5457264 from 1822489e2c55a937a8dbbf07a15f3845bdab3965 to qt-release

Change-Id: I84839b2f63968c422ca01095a0b85b662927d820

2 files changed, 3 insertions, 2 deletions

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
index a9495c965..425307139 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
@@ -149,7 +149,8 @@ public class CellBroadcastAlertDialog extends Activity {
         private boolean initDrawableAndImageView() {
             if (mWarningIcon == null) {
                 try {
-                    mWarningIcon = getResources().getDrawable(R.drawable.ic_warning_googred);
+                    mWarningIcon = CellBroadcastSettings.getResourcesForDefaultSmsSubscriptionId(
+                            getApplicationContext()).getDrawable(R.drawable.ic_warning_googred);
                 } catch (Resources.NotFoundException e) {
                     Log.e(TAG, "warning icon resource not found", e);
                     return false;
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
index 71be3d703..48a1573e6 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
@@ -106,7 +106,7 @@ public class CellBroadcastReceiver extends BroadcastReceiver {
             // rename registered notification channels on locale change
             CellBroadcastAlertService.createNotificationChannels(context);
         } else if (Intent.ACTION_SERVICE_STATE.equals(action)) {
-            if (context.getResources().getBoolean(
+            if (CellBroadcastSettings.getResourcesForDefaultSmsSubscriptionId(context).getBoolean(
                     R.bool.reset_duplicate_detection_on_airplane_mode)) {
                 Bundle extras = intent.getExtras();
                 ServiceState ss = ServiceState.newFromBundle(extras);