Merge "Phone-switch cleanup: remove updateParentPhone()." into nyc-dev (c1128c76) · Commits · e / os / android_frameworks_opt_telephony

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

+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() {
		}

+0 −19

Original line number	Diff line number	Diff line
		@@ -196,25 +196,6 @@ public class ImsPhone extends ImsPhoneBase {
		}

		//todo: get rid of this function. It is not needed since parentPhone obj never changes
		@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");

+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");
		}