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

Commit b52ad26b authored by Anthony Lee's avatar Anthony Lee Committed by Android (Google) Code Review
Browse files

Merge "Changed the prototype for onCallMerged." into lmp-mr1-dev

parents 95113192 e0edd708

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

+1 −1
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ public final class ImsPhoneCallTracker extends CallTracker { 
        }



        @Override

        public void onCallMerged(ImsCall call, ImsCall newCall) {

        public void onCallMerged(ImsCall call) {

            if (DBG) log("onCallMerged");



            mForegroundCall.merge(mBackgroundCall, mForegroundCall.getState());