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

Commit 787abf3c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [3436310, 3434392, 3435998, 3435077, 3435273, 3436350,... 

Merge cherrypicks of [3436310, 3434392, 3435998, 3435077, 3435273, 3436350, 3434393, 3434394, 3434395, 3434696, 3435999, 3434352, 3434353, 3434354, 3435080, 3436041, 3434355, 3435813, 3435082, 3435084, 3434396, 3434397, 3436061, 3436000] into oc-m2-release

Change-Id: I25d7319701422f302c4e8f8dbb97e0c4f9c86318
parents 288f1e6c 9fb6ea43

src/com/android/server/telecom/CallLogManager.java

+9 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.os.Looper; 
import android.os.UserHandle;

import android.os.PersistableBundle;

import android.provider.CallLog.Calls;

import android.telecom.Connection;

import android.telecom.DisconnectCause;

import android.telecom.Log;

import android.telecom.PhoneAccount;
@@ -226,7 +227,9 @@ public final class CallLogManager extends CallsManagerListenerBase { 
                call.getCallDataUsage();



        int callFeatures = getCallFeatures(call.getVideoStateHistory(),

                call.getDisconnectCause().getCode() == DisconnectCause.CALL_PULLED);

                call.getDisconnectCause().getCode() == DisconnectCause.CALL_PULLED,

                (call.getConnectionProperties() & Connection.PROPERTY_ASSISTED_DIALING_USED) ==

                        Connection.PROPERTY_ASSISTED_DIALING_USED);

        logCall(call.getCallerInfo(), logNumber, call.getPostDialDigits(), formattedViaNumber,

                call.getHandlePresentation(), callLogType, callFeatures, accountHandle,

                creationTime, age, callDataUsage, call.isEmergencyCall(), call.getInitiatingUser(),
@@ -303,7 +306,8 @@ public final class CallLogManager extends CallsManagerListenerBase { 
     * @param isPulledCall {@code true} if this call was pulled to another device.

     * @return The call features.

     */

    private static int getCallFeatures(int videoState, boolean isPulledCall) {

    private static int getCallFeatures(int videoState, boolean isPulledCall,

                                       boolean isUsingAssistedDialing) {

        int features = 0;

        if (VideoProfile.isVideo(videoState)) {

            features |= Calls.FEATURES_VIDEO;
@@ -311,6 +315,9 @@ public final class CallLogManager extends CallsManagerListenerBase { 
        if (isPulledCall) {

            features |= Calls.FEATURES_PULLED_EXTERNALLY;

        }

        if (isUsingAssistedDialing) {

            features |= Calls.FEATURES_ASSISTED_DIALING_USED;

        }

        return features;

    }

src/com/android/server/telecom/ParcelableCallUtils.java

+4 −1
Original line number Diff line number Diff line
@@ -336,7 +336,10 @@ public class ParcelableCallUtils { 
        android.telecom.Call.Details.PROPERTY_HAS_CDMA_VOICE_PRIVACY,



        Connection.PROPERTY_SELF_MANAGED,

        android.telecom.Call.Details.PROPERTY_SELF_MANAGED

        android.telecom.Call.Details.PROPERTY_SELF_MANAGED,



        Connection.PROPERTY_ASSISTED_DIALING_USED,

        android.telecom.Call.Details.PROPERTY_ASSISTED_DIALING_USED

    };



    private static int convertConnectionToCallProperties(int connectionProperties) {