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

Commit 8dd4c44b authored by Hall Liu's avatar Hall Liu
Browse files

Allow business call extra to go to screening 

Bug: 179912994
Test: atest ParcelableCallUtilsTest
Change-Id: Ib98938a2a2a3483676d2a0b40933f354c08e18a0
parent 67f64a66

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

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.telecom.DisconnectCause; 
import android.telecom.ParcelableCall;

import android.telecom.ParcelableRttCall;

import android.telecom.TelecomManager;

import android.telephony.ims.ImsCallProfile;

import android.text.TextUtils;



import java.util.ArrayList;
@@ -61,6 +62,7 @@ public class ParcelableCallUtils { 
    static {

        RESTRICTED_CALL_SCREENING_EXTRA_KEYS = new ArrayList<>();

        RESTRICTED_CALL_SCREENING_EXTRA_KEYS.add(android.telecom.Connection.EXTRA_SIP_INVITE);

        RESTRICTED_CALL_SCREENING_EXTRA_KEYS.add(ImsCallProfile.EXTRA_IS_BUSINESS_CALL);

    }



    public static class Converter {

tests/src/com/android/server/telecom/tests/ParcelableCallUtilsTest.java

+7 −3
Original line number Diff line number Diff line 
package com.android.server.telecom.tests;



import static com.android.server.telecom.TelecomSystem.*;

import static com.android.server.telecom.TelecomSystem.SyncRoot;



import static junit.framework.Assert.assertEquals;

import static junit.framework.Assert.assertFalse;

import static junit.framework.Assert.assertTrue;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.when;



import android.content.ComponentName;
@@ -17,6 +16,7 @@ import android.os.SystemClock; 
import android.telecom.Connection;

import android.telecom.ParcelableCall;

import android.telecom.PhoneAccountHandle;

import android.telephony.ims.ImsCallProfile;

import android.test.suitebuilder.annotation.SmallTest;



import com.android.server.telecom.Call;
@@ -26,7 +26,6 @@ import com.android.server.telecom.ClockProxy; 
import com.android.server.telecom.ParcelableCallUtils;

import com.android.server.telecom.PhoneAccountRegistrar;

import com.android.server.telecom.PhoneNumberUtilsAdapter;

import com.android.server.telecom.TelecomSystem;

import com.android.server.telecom.ui.ToastFactory;



import org.junit.After;
@@ -98,6 +97,7 @@ public class ParcelableCallUtilsTest extends TelecomTestCase { 


        Bundle parceledExtras = call.getExtras();

        assertFalse(parceledExtras.containsKey(Connection.EXTRA_SIP_INVITE));

        assertTrue(parceledExtras.containsKey(ImsCallProfile.EXTRA_IS_BUSINESS_CALL));

        assertFalse(parceledExtras.containsKey("SomeExtra"));

        assertTrue(parceledExtras.containsKey(Connection.EXTRA_CALL_SUBJECT));

    }
@@ -115,6 +115,7 @@ public class ParcelableCallUtilsTest extends TelecomTestCase { 


        Bundle parceledExtras = call.getExtras();

        assertTrue(parceledExtras.containsKey(Connection.EXTRA_SIP_INVITE));

        assertTrue(parceledExtras.containsKey(ImsCallProfile.EXTRA_IS_BUSINESS_CALL));

        assertTrue(parceledExtras.containsKey("SomeExtra"));

        assertTrue(parceledExtras.containsKey(Connection.EXTRA_CALL_SUBJECT));

    }
@@ -128,6 +129,7 @@ public class ParcelableCallUtilsTest extends TelecomTestCase { 


        Bundle parceledExtras = call.getExtras();

        assertTrue(parceledExtras.containsKey(Connection.EXTRA_SIP_INVITE));

        assertTrue(parceledExtras.containsKey(ImsCallProfile.EXTRA_IS_BUSINESS_CALL));

        assertFalse(parceledExtras.containsKey("SomeExtra"));

        assertFalse(parceledExtras.containsKey(Connection.EXTRA_CALL_SUBJECT));

    }
@@ -141,6 +143,7 @@ public class ParcelableCallUtilsTest extends TelecomTestCase { 


        Bundle parceledExtras = call.getExtras();

        assertFalse(parceledExtras.containsKey(Connection.EXTRA_SIP_INVITE));

        assertFalse(parceledExtras.containsKey(ImsCallProfile.EXTRA_IS_BUSINESS_CALL));

        assertFalse(parceledExtras.containsKey("SomeExtra"));

        assertFalse(parceledExtras.containsKey(Connection.EXTRA_CALL_SUBJECT));

    }
@@ -192,6 +195,7 @@ public class ParcelableCallUtilsTest extends TelecomTestCase { 
        extras.putString(Connection.EXTRA_SIP_INVITE, "scary data");

        extras.putString("SomeExtra", "Extra Extra");

        extras.putString(Connection.EXTRA_CALL_SUBJECT, "Blah");

        extras.putBoolean(ImsCallProfile.EXTRA_IS_BUSINESS_CALL, true);

        return extras;

    }

}