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

Commit 714936fa authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Add cleanupCalls to call tracker." into oc-dr1-dev 

am: 7bd07276

Change-Id: Ia5b2d6ad3981f279172d370a5ce6dac57ba4493b
parents 4007c2ef 7bd07276

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

+8 −0
Original line number Diff line number Diff line
@@ -296,6 +296,14 @@ public abstract class CallTracker extends Handler { 
    public abstract PhoneConstants.State getState();

    protected abstract void log(String msg);



    /**

     * Called when the call tracker should attempt to reconcile its calls against its underlying

     * phone implementation and cleanup any stale calls.

     */

    public void cleanupCalls() {

        // no base implementation

    }



    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.println("CallTracker:");

        pw.println(" mPendingOperations=" + mPendingOperations);

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

+9 −0
Original line number Diff line number Diff line
@@ -1672,4 +1672,13 @@ public class GsmCdmaCallTracker extends CallTracker { 
                MAX_CONNECTIONS_PER_CALL_GSM :

                MAX_CONNECTIONS_PER_CALL_CDMA;

    }



    /**

     * Called to force the call tracker to cleanup any stale calls.  Does this by triggering

     * {@code GET_CURRENT_CALLS} on the RIL.

     */

    @Override

    public void cleanupCalls() {

        pollCallsWhenSafe();

    }

}