Loading telephony/java/com/android/internal/telephony/CallManager.java +9 −1 Original line number Diff line number Diff line Loading @@ -100,6 +100,7 @@ public final class CallManager { // default phone as the first phone registered, which is PhoneBase obj private Phone mDefaultPhone; private boolean acceptingRingingCall; // state registrants protected final RegistrantList mPreciseCallStateRegistrants = new RegistrantList(); Loading Loading @@ -170,6 +171,7 @@ public final class CallManager { mBackgroundCalls = new ArrayList<Call>(); mForegroundCalls = new ArrayList<Call>(); mDefaultPhone = null; acceptingRingingCall = false; } /** Loading Loading @@ -376,7 +378,12 @@ public final class CallManager { int mode = AudioManager.MODE_NORMAL; switch (getState()) { case RINGING: if (acceptingRingingCall) { mode = AudioManager.MODE_IN_CALL; acceptingRingingCall = false; } else { mode = AudioManager.MODE_RINGTONE; } break; case OFFHOOK: Phone fgPhone = getFgPhone(); Loading Loading @@ -510,6 +517,7 @@ public final class CallManager { } ringingPhone.acceptCall(); acceptingRingingCall = true; if (VDBG) { Log.d(LOG_TAG, "End acceptCall(" +ringingCall + ")"); Loading Loading
telephony/java/com/android/internal/telephony/CallManager.java +9 −1 Original line number Diff line number Diff line Loading @@ -100,6 +100,7 @@ public final class CallManager { // default phone as the first phone registered, which is PhoneBase obj private Phone mDefaultPhone; private boolean acceptingRingingCall; // state registrants protected final RegistrantList mPreciseCallStateRegistrants = new RegistrantList(); Loading Loading @@ -170,6 +171,7 @@ public final class CallManager { mBackgroundCalls = new ArrayList<Call>(); mForegroundCalls = new ArrayList<Call>(); mDefaultPhone = null; acceptingRingingCall = false; } /** Loading Loading @@ -376,7 +378,12 @@ public final class CallManager { int mode = AudioManager.MODE_NORMAL; switch (getState()) { case RINGING: if (acceptingRingingCall) { mode = AudioManager.MODE_IN_CALL; acceptingRingingCall = false; } else { mode = AudioManager.MODE_RINGTONE; } break; case OFFHOOK: Phone fgPhone = getFgPhone(); Loading Loading @@ -510,6 +517,7 @@ public final class CallManager { } ringingPhone.acceptCall(); acceptingRingingCall = true; if (VDBG) { Log.d(LOG_TAG, "End acceptCall(" +ringingCall + ")"); Loading