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

Commit 6b5eb94a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Add FDN contact search config and FDN call capability"

parents 616d51a8 5e512d0c

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -2312,4 +2312,6 @@ 


    <!-- Whether to start in touch mode -->

    <bool name="config_defaultInTouchMode">true</bool>

   <!-- config for FDN contact search. Disabled by default -->

   <bool name="config_fdn_contact_search">false</bool>

</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2335,4 +2335,5 @@ 
  <java-symbol type="bool" name="config_use_sim_language_file" />

  <java-symbol type="bool" name="config_LTE_eri_for_network_name" />

  <java-symbol type="bool" name="config_defaultInTouchMode" />

  <java-symbol type="bool" name="config_fdn_contact_search"/>

</resources>

telecomm/java/android/telecom/PhoneCapabilities.java

+6 −0
Original line number Diff line number Diff line
@@ -131,6 +131,12 @@ public final class PhoneCapabilities { 
     */

    public static final int CALL_TYPE_MODIFIABLE = 0x00020000;



    /**

     * This will include as capability for GSM call and if FDN is enabled.

     * @hide

     */

    public static final int FDN_ENABLED = 0x00040000;



    /**

     * Whether this set of capabilities supports the specified capability.

     * @param capabilities The set of capabilities.