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

Commit ac5d3748 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Add config option to enable/disable pause workaround." into oc-dev am: 93db1a69 

am: 3f71b149

Change-Id: I2d66953d5a5defc7eac1f585e706359523e2e0de
parents b5af660f 3f71b149

core/res/res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -2908,6 +2908,11 @@ 
    <!-- Default data warning level in mb -->

    <integer name="default_data_warning_level_mb">2048</integer>



    <!-- When true, indicates that the vendor's IMS implementation requires a workaround when

     sending a request to enable or disable the camera while the video session is also

     paused. -->

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



    <!-- Whether to send a custom package name with the PSD.-->

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

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -3020,7 +3020,7 @@ 
  <java-symbol type="bool" name="enable_pbap_pce_profile" />



  <java-symbol type="integer" name="default_data_warning_level_mb" />



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

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

  <java-symbol type="string" name="config_helpPackageNameKey" />

  <java-symbol type="string" name="config_helpPackageNameValue" />