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

Commit dfba6f87 authored by Bonian Chen's avatar Bonian Chen
Browse files

[Setting] Fix merge conflict 

Fix merge conflict for I367ae3a5f97ff92e03312bed6fe37727ae3798ab

Bug: 144960427
Test: build pass
Change-Id: I24d684b4e695e8ab777f2ba7811b93f6028260d9
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
parent 95e1c8d0

src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java

+11 −10
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ import android.os.Bundle; 
import android.os.PersistableBundle;

import android.os.UserHandle;

import android.telephony.CarrierConfigManager;

import android.telephony.SmsCbMessage;

import android.telephony.PhoneStateListener;

import android.telephony.ServiceState;

import android.telephony.SignalStrength;

import android.telephony.SmsCbMessage;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
@@ -407,7 +407,8 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
        final PersistableBundle carrierConfig =

                mCarrierConfigManager.getConfigForSubId(subscriptionId);

        final boolean showImsRegState = carrierConfig == null ? false :

            carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL);

                carrierConfig.getBoolean(

                        CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL);

        if (showImsRegState) {

            final boolean isImsRegistered = mTelephonyManager.isImsRegistered(subscriptionId);

            mDialog.setText(IMS_REGISTRATION_STATE_VALUE_ID, mRes.getString(isImsRegistered ?

tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java

+23 −37
Original line number Diff line number Diff line
@@ -16,35 +16,21 @@ 


package com.android.settings.deviceinfo.simstatus;



import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .CELL_DATA_NETWORK_TYPE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .CELL_VOICE_NETWORK_TYPE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.CELL_DATA_NETWORK_TYPE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.CELL_VOICE_NETWORK_TYPE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.EID_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .ICCID_INFO_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .ICCID_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .IMS_REGISTRATION_STATE_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .IMS_REGISTRATION_STATE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .NETWORK_PROVIDER_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .OPERATOR_INFO_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .OPERATOR_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .PHONE_NUMBER_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .ROAMING_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .SERVICE_STATE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .SIGNAL_STRENGTH_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .SIGNAL_STRENGTH_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ICCID_INFO_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ICCID_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.IMS_REGISTRATION_STATE_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.IMS_REGISTRATION_STATE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.NETWORK_PROVIDER_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.OPERATOR_INFO_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.OPERATOR_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.PHONE_NUMBER_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ROAMING_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SERVICE_STATE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_VALUE_ID;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;