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

Commit 357a1118 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Rename EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED." into rvc-dev am: 566065f7 

Change-Id: Ie34408f7f8662bd5ece708c884e731d787356981
parents be30edf3 566065f7

src/java/com/android/internal/telephony/PhoneConfigurationManager.java

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.internal.telephony;



import static android.telephony.TelephonyManager.ACTION_MULTI_SIM_CONFIG_CHANGED;

import static android.telephony.TelephonyManager.EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED;

import static android.telephony.TelephonyManager.EXTRA_ACTIVE_SIM_SUPPORTED_COUNT;



import android.content.Context;

import android.content.Intent;
@@ -28,12 +28,12 @@ import android.os.PowerManager; 
import android.os.RegistrantList;

import android.sysprop.TelephonyProperties;

import android.telephony.PhoneCapability;

import com.android.telephony.Rlog;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.util.Log;



import com.android.internal.annotations.VisibleForTesting;

import com.android.telephony.Rlog;



import java.util.HashMap;

import java.util.Map;
@@ -407,7 +407,7 @@ public class PhoneConfigurationManager { 
        notifyMultiSimConfigChange(numOfActiveModems);



        Intent intent = new Intent(ACTION_MULTI_SIM_CONFIG_CHANGED);

        intent.putExtra(EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED, numOfActiveModems);

        intent.putExtra(EXTRA_ACTIVE_SIM_SUPPORTED_COUNT, numOfActiveModems);

        mContext.sendBroadcast(intent);

    }

tests/telephonytests/src/com/android/internal/telephony/PhoneConfigurationManagerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.internal.telephony;



import static android.telephony.TelephonyManager.ACTION_MULTI_SIM_CONFIG_CHANGED;

import static android.telephony.TelephonyManager.EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED;

import static android.telephony.TelephonyManager.EXTRA_ACTIVE_SIM_SUPPORTED_COUNT;

import static android.telephony.TelephonyManager.MODEM_COUNT_DUAL_MODEM;

import static android.telephony.TelephonyManager.MODEM_COUNT_SINGLE_MODEM;
@@ -182,7 +182,7 @@ public class PhoneConfigurationManagerTest extends TelephonyTest { 
        Intent intent = intentCaptor.getValue();

        assertEquals(ACTION_MULTI_SIM_CONFIG_CHANGED, intent.getAction());

        assertEquals(MODEM_COUNT_DUAL_MODEM, intent.getIntExtra(

                EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED, 0));

                EXTRA_ACTIVE_SIM_SUPPORTED_COUNT, 0));



        // Verify RIL notification.

        verify(mMockCi).onSlotActiveStatusChange(true);