Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9d28487e: Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev

Browse Source 
* commit '9d28487e05b6f5b2c4d464467f932060de463067':
  Disable Content-Disposition header for 53005 and 310120
This commit is contained in:
Ye Wen
2014-10-23 07:55:19 +00:00
committed by Android Git Automerger
parent b7db4ed08d 9d28487e05
commit 4e0ba1988a
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values-mcc310-mnc120/config.xml
View File

@@ -27,4 +27,8 @@
<!-- Sprint need a 70 ms delay for 3way call --> <!-- Sprint need a 70 ms delay for 3way call -->
<integer name="config_cdma_3waycall_flash_delay">70</integer> <integer name="config_cdma_3waycall_flash_delay">70</integer>
<!-- If this value is true, The mms content-disposition field is supported correctly.
If false, Content-disposition fragments are ignored -->
<bool name="config_mms_content_disposition_support">false</bool>
</resources> </resources>

26
core/res/res/values-mcc530-mnc05/config.xml Normal file
View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2014, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You my obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
<!-- If this value is true, The mms content-disposition field is supported correctly.
If false, Content-disposition fragments are ignored -->
<bool name="config_mms_content_disposition_support">false</bool>
</resources>