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

Commit d1d673d2 authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Phone-switch cleanup: remove updateParentPhone(). 

This is not needed as the parent phone object never changes with
the phone-switch refactor.

Bug: 25793157
Change-Id: If1cf30bc9f35a23cf7fc1c713517e99cbaa063b1
parent 3e1a34f2

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

+0 −4
Original line number Diff line number Diff line
@@ -3066,10 +3066,6 @@ public class GsmCdmaPhone extends Phone { 
                    " is not CDMA or GSM (error) - aborting!");

            return;

        }



        if (mImsPhone != null) {

            mImsPhone.updateParentPhone(this);

        }

    }



    @Override

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

+0 −3
Original line number Diff line number Diff line
@@ -3136,9 +3136,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        }

    }



    public void updateParentPhone(Phone parentPhone) {

    }



    public void startRingbackTone() {

    }

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+0 −19
Original line number Diff line number Diff line
@@ -194,25 +194,6 @@ public class ImsPhone extends ImsPhoneBase { 
        updateDataServiceState();

    }



    @Override

    public void updateParentPhone(Phone parentPhone) {

        synchronized (Phone.lockForRadioTechnologyChange) {

            mDefaultPhone = parentPhone;

            mPhoneId = mDefaultPhone.getPhoneId();

            if (mDefaultPhone.getServiceStateTracker() != null) {

                mDefaultPhone.getServiceStateTracker()

                        .registerForDataRegStateOrRatChanged(this,

                                EVENT_DEFAULT_PHONE_DATA_STATE_CHANGED, null);

            }

            updateDataServiceState();



            // When the parent phone is updated, we need to notify listeners of the cached video

            // capability.

            Rlog.d(LOG_TAG, "updateParentPhone - Notify video capability changed " + mIsVideoCapable);

            notifyForVideoCapabilityChanged(mIsVideoCapable);

        }

    }



    @Override

    public void dispose() {

        Rlog.d(LOG_TAG, "dispose");

tests/telephonytests/src/com/android/internal/telephony/mocks/PhoneMock.java

+0 −4
Original line number Diff line number Diff line
@@ -1029,10 +1029,6 @@ public class PhoneMock extends Phone { 
        throw new RuntimeException("not implemented");

    }



    public void updateParentPhone(Phone parentPhone) {

        throw new RuntimeException("not implemented");

    }



    public void startRingbackTone() {

        throw new RuntimeException("not implemented");

    }