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

Merge "move CellBroadcastMessage from telephony-common to app" am: 12a7368ad2

Browse Source 
am: 04bcf7ec6c

Change-Id: I4cb440a59d5f6de5815b8ee942b3f29d2a770d4b
This commit is contained in:
Chen Xu
2019-10-25 11:09:18 -07:00
committed by android-build-merger
parent 5b182f20cb 04bcf7ec6c
commit 67f5eb6746
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
View File

@@ -16,11 +16,6 @@
package com.android.settings.deviceinfo.simstatus;
import static android.content.Context.CARRIER_CONFIG_SERVICE;
import static android.content.Context.EUICC_SERVICE;
import static android.content.Context.TELEPHONY_SERVICE;
import static android.content.Context.TELEPHONY_SUBSCRIPTION_SERVICE;
import android.Manifest;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -31,7 +26,7 @@ import android.os.Bundle;
import android.os.PersistableBundle;
import android.os.UserHandle;
import android.telephony.CarrierConfigManager;
import android.telephony.CellBroadcastMessage;
import android.telephony.SmsCbMessage;
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
import android.telephony.SignalStrength;
@@ -109,6 +104,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
};
private SubscriptionInfo mSubscriptionInfo;
private int mSlotIndex;
private final SimStatusDialogFragment mDialog;
private final TelephonyManager mTelephonyManager;
@@ -129,9 +125,8 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
if (extras == null) {
return;
}
final CellBroadcastMessage cbMessage = (CellBroadcastMessage) extras.get("message");
if (cbMessage != null
&& mSubscriptionInfo.getSubscriptionId() == cbMessage.getSubId()) {
final SmsCbMessage cbMessage = (SmsCbMessage) extras.get("message");
if (cbMessage != null && mSlotIndex == cbMessage.getSlotIndex()) {
final String latestAreaInfo = cbMessage.getMessageBody();
mDialog.setText(OPERATOR_INFO_VALUE_ID, latestAreaInfo);
}
@@ -145,7 +140,9 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
int slotId) {
mDialog = dialog;
mContext = dialog.getContext();
mSlotIndex = slotId;
mSubscriptionInfo = getPhoneSubscriptionInfo(slotId);
mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
mCarrierConfigManager = mContext.getSystemService(CarrierConfigManager.class);
mEuiccManager = mContext.getSystemService(EuiccManager.class);