Added support for writing Calls.FEATURES_WIFI and Calls.FEATURES_HD_CALL to the Call Log.
Test: cts Test.
Bug: 141264545
Change-Id: I12e5785c669c615e3e53016dde06caea5c0ea38e
diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/telecom/Call.java
index b1d394b..dbb8ce2 100644
--- a/src/com/android/server/telecom/Call.java
+++ b/src/com/android/server/telecom/Call.java
@@ -431,6 +431,7 @@
private boolean mWasConferencePreviouslyMerged = false;
private boolean mWasHighDefAudio = false;
+ private boolean mWasWifi = false;
// For conferences which support merge/swap at their level, we retain a notion of an active
// call. This is used for BluetoothPhoneService. In order to support hold/merge, it must have
@@ -1570,6 +1571,7 @@
}
mWasHighDefAudio = (connectionProperties & Connection.PROPERTY_HIGH_DEF_AUDIO) ==
Connection.PROPERTY_HIGH_DEF_AUDIO;
+ mWasWifi = (connectionProperties & Connection.PROPERTY_WIFI) > 0;
for (Listener l : mListeners) {
l.onConnectionPropertiesChanged(this, didRttChange);
}
@@ -3200,6 +3202,15 @@
return mWasHighDefAudio;
}
+ /**
+ * Returns wether or not Wifi call was used.
+ *
+ * @return true if wifi call was used during this call.
+ */
+ boolean wasWifi() {
+ return mWasWifi;
+ }
+
public void setIsUsingCallFiltering(boolean isUsingCallFiltering) {
mIsUsingCallFiltering = isUsingCallFiltering;
}
diff --git a/src/com/android/server/telecom/CallLogManager.java b/src/com/android/server/telecom/CallLogManager.java
index 7748616..86d3cc1 100755
--- a/src/com/android/server/telecom/CallLogManager.java
+++ b/src/com/android/server/telecom/CallLogManager.java
@@ -324,7 +324,7 @@
int callFeatures = getCallFeatures(call.getVideoStateHistory(),
call.getDisconnectCause().getCode() == DisconnectCause.CALL_PULLED,
- shouldSaveHdInfo(call, accountHandle),
+ call.wasHighDefAudio(), call.wasWifi(),
(call.getConnectionProperties() & Connection.PROPERTY_ASSISTED_DIALING_USED) ==
Connection.PROPERTY_ASSISTED_DIALING_USED,
call.wasEverRttCall());
@@ -447,11 +447,12 @@
* @param videoState The video state.
* @param isPulledCall {@code true} if this call was pulled to another device.
* @param isStoreHd {@code true} if this call was used HD.
+ * @param isWifi {@code true} if this call was used wifi.
* @param isUsingAssistedDialing {@code true} if this call used assisted dialing.
* @return The call features.
*/
private static int getCallFeatures(int videoState, boolean isPulledCall, boolean isStoreHd,
- boolean isUsingAssistedDialing, boolean isRtt) {
+ boolean isWifi, boolean isUsingAssistedDialing, boolean isRtt) {
int features = 0;
if (VideoProfile.isVideo(videoState)) {
features |= Calls.FEATURES_VIDEO;
@@ -462,6 +463,9 @@
if (isStoreHd) {
features |= Calls.FEATURES_HD_CALL;
}
+ if (isWifi) {
+ features |= Calls.FEATURES_WIFI;
+ }
if (isUsingAssistedDialing) {
features |= Calls.FEATURES_ASSISTED_DIALING_USED;
}
@@ -471,22 +475,6 @@
return features;
}
- private boolean shouldSaveHdInfo(Call call, PhoneAccountHandle accountHandle) {
- CarrierConfigManager configManager = (CarrierConfigManager) mContext.getSystemService(
- Context.CARRIER_CONFIG_SERVICE);
- PersistableBundle configBundle = null;
- if (configManager != null) {
- configBundle = configManager.getConfigForSubId(
- mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(accountHandle));
- }
- if (configBundle != null && configBundle.getBoolean(
- CarrierConfigManager.KEY_IDENTIFY_HIGH_DEFINITION_CALLS_IN_CALL_LOG_BOOL)
- && call.wasHighDefAudio()) {
- return true;
- }
- return false;
- }
-
/**
* Retrieve the phone number from the call, and then process it before returning the
* actual number that is to be logged.
