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

Commit d0c82ed4 authored by Meng Wang's avatar Meng Wang Committed by Automerger Merge Worker
Browse files

Merge "Rename Phone#getCellIdentity to getCurrentCellIdentity" am: c230d42e... 

Merge "Rename Phone#getCellIdentity to getCurrentCellIdentity" am: c230d42e am: a2d6fa18 am: 039e2d71

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1360819

Change-Id: I1c531850b7d7d96b3e36e4648ae90345c2eafb8d
parents 993d9547 039e2d71

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

+1 −1
Original line number Diff line number Diff line
@@ -1546,7 +1546,7 @@ public class GsmCdmaCallTracker extends CallTracker { 
                    causeCode == CallFailCause.BEARER_NOT_AVAIL ||

                    causeCode == CallFailCause.ERROR_UNSPECIFIED) {



                    CellLocation loc = mPhone.getCellIdentity().asCellLocation();

                    CellLocation loc = mPhone.getCurrentCellIdentity().asCellLocation();

                    int cid = -1;

                    if (loc != null) {

                        if (loc instanceof GsmCellLocation) {

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

+2 −2
Original line number Diff line number Diff line
@@ -1958,9 +1958,9 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    }



    /**

     * @return the current cell location if known

     * Returns the current CellIdentify if known

     */

    public CellIdentity getCellIdentity() {

    public CellIdentity getCurrentCellIdentity() {

        return getServiceStateTracker().getCellIdentity();

    }

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -3864,7 +3864,7 @@ public class DcTracker extends Handler { 


    private int getCellLocationId() {

        int cid = -1;

        CellLocation loc = mPhone.getCellIdentity().asCellLocation();

        CellLocation loc = mPhone.getCurrentCellIdentity().asCellLocation();



        if (loc != null) {

            if (loc instanceof GsmCellLocation) {

src/java/com/android/internal/telephony/vendor/dataconnection/VendorDataResetEventTracker.java

+2 −2
Original line number Diff line number Diff line
@@ -127,9 +127,9 @@ public class VendorDataResetEventTracker { 
        mContext.registerReceiver(mSimStateReceiver, new IntentFilter(

                TelephonyIntents.ACTION_SIM_STATE_CHANGED));



        CellLocation currentCellLocation = mPhone.getCellIdentity().asCellLocation();

        CellLocation currentCellLocation = mPhone.getCurrentCellIdentity().asCellLocation();

        if (currentCellLocation instanceof GsmCellLocation) {

            mPreviousLocation = (GsmCellLocation) mPhone.getCellIdentity().asCellLocation();

            mPreviousLocation = (GsmCellLocation) currentCellLocation;

            if (DBG) log("DataConnection mPreviousLocation : " + mPreviousLocation);

        }

        int ddsSubId = SubscriptionManager.getDefaultDataSubscriptionId();

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

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ public class DefaultPhoneNotifierTest extends TelephonyTest { 
        // mock gsm cell location

        CellIdentityGsm mGsmCellLocation = new CellIdentityGsm(

                2, 3, 0, 0, null, null, null, null, Collections.emptyList());

        doReturn(mGsmCellLocation).when(mPhone).getCellIdentity();

        doReturn(mGsmCellLocation).when(mPhone).getCurrentCellIdentity();

        ArgumentCaptor<CellIdentityGsm> cellLocationCapture =

                ArgumentCaptor.forClass(CellIdentityGsm.class);