am ff4077f5: am 14282b8f: Merge "No notifications for disconnected unknown calls." into mnc-dr-dev
* commit 'ff4077f5e2c63be29df4dcf3a664e4c1c694f4f5':
No notifications for disconnected unknown calls.
diff --git a/src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java b/src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
index b9234a5..a0a7efd 100644
--- a/src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
+++ b/src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
@@ -725,6 +725,7 @@
// These cases need no "last call fail" reason
for (int i = mDroppedDuringPoll.size() - 1; i >= 0 ; i--) {
CdmaConnection conn = mDroppedDuringPoll.get(i);
+ boolean wasDisconnected = false;
if (conn.isIncoming() && conn.getConnectTime() == 0) {
// Missed or rejected call
@@ -741,10 +742,17 @@
}
mDroppedDuringPoll.remove(i);
hasAnyCallDisconnected |= conn.onDisconnect(cause);
+ wasDisconnected = true;
} else if (conn.mCause == DisconnectCause.LOCAL
|| conn.mCause == DisconnectCause.INVALID_NUMBER) {
mDroppedDuringPoll.remove(i);
hasAnyCallDisconnected |= conn.onDisconnect(conn.mCause);
+ wasDisconnected = true;
+ }
+
+ if (wasDisconnected && unknownConnectionAppeared && conn == newUnknown) {
+ unknownConnectionAppeared = false;
+ newUnknown = null;
}
}
