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

Commit 8643790b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Catch NPE in ImsPhoneCallTracker#holdActiveCall when call to hold is... 

Merge "Catch NPE in ImsPhoneCallTracker#holdActiveCall when call to hold is null." into sc-qpr1-dev am: 410b60d7 am: c89db5aa

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

Change-Id: I10ad99dcd2d2772d6f4b8e93551e7a4f00c0bd12
parents 3e1b567f c89db5aa

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

+1 −1
Original line number Diff line number Diff line
@@ -1857,7 +1857,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                callToHold.hold();

                mMetrics.writeOnImsCommand(mPhone.getPhoneId(), callToHold.getSession(),

                        ImsCommand.IMS_CMD_HOLD);

            } catch (ImsException e) {

            } catch (ImsException | NullPointerException e) {

                mForegroundCall.switchWith(mBackgroundCall);

                mHoldSwitchingState = oldHoldState;

                logHoldSwapState("holdActiveCall - fail");