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

Commit 3cfc15ed authored by Nazanin Bakhshi's avatar Nazanin Bakhshi Committed by android-build-merger
Browse files

Merge "make onActiveDataSubId in PhoneStateListener public API" am: eb5db7d7 

am: 1991c72b

Change-Id: I2177031f56fb423f2dfb8e29842ba05a8c188d1a
parents feebbaae 1991c72b

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

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */

package com.android.internal.telephony;



import static android.telephony.PhoneStateListener.LISTEN_ACTIVE_DATA_SUBID_CHANGE;

import static android.telephony.PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE;

import static android.telephony.PhoneStateListener.LISTEN_PHONE_CAPABILITY_CHANGE;

import static android.telephony.PhoneStateListener.LISTEN_SRVCC_STATE_CHANGED;
@@ -60,7 +60,7 @@ public class TelephonyRegistryTest extends TelephonyTest { 
            setReady(true);

        }

        @Override

        public void onActiveDataSubIdChanged(int activeSubId) {

        public void onActiveDataSubscriptionIdChanged(int activeSubId) {

            mActiveSubId = activeSubId;

            setReady(true);

        }
@@ -128,7 +128,7 @@ public class TelephonyRegistryTest extends TelephonyTest { 
        mTelephonyRegistry.notifyActiveDataSubIdChanged(activeSubId);

        mTelephonyRegistry.listen(mContext.getOpPackageName(),

                mPhoneStateListener.callback,

                LISTEN_ACTIVE_DATA_SUBID_CHANGE, true);

                LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE, true);

        waitUntilReady();

        assertEquals(activeSubId, mActiveSubId);