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

Commit 764b394b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Change Bundle.filterValues() to TelephonyUtils reference" am:... 

Merge "Change Bundle.filterValues() to TelephonyUtils reference" am: 546e10a7 am: 0c3a90dc am: 899573c1

Change-Id: I1ab96d688958b1d3e924156575a07cfa8236e2ab
parents c8fb4adf 899573c1

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

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.util.Log; 
import com.android.ims.internal.ConferenceParticipant;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.emergency.EmergencyNumberTracker;

import com.android.internal.telephony.util.TelephonyUtils;



import java.util.ArrayList;

import java.util.List;
@@ -1029,7 +1030,7 @@ public abstract class Connection { 
            int previousCount = mExtras.size();

            // Prevent vendors from passing in extras other than primitive types and android API

            // parcelables.

            mExtras = mExtras.filterValues();

            mExtras = TelephonyUtils.filterValues(mExtras);

            int filteredCount = mExtras.size();

            if (filteredCount != previousCount) {

                Rlog.i(TAG, "setConnectionExtras: filtering " + (previousCount - filteredCount)