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

Merge "Add device capabilities."

Browse Source 
am: 86316a4b42

Change-Id: I9aa51ecb8f3784e449b29358307646848ef3a309
This commit is contained in:
Holly Jiuyu Sun
2018-02-26 07:35:22 +00:00
committed by android-build-merger
parent 34d08160bd 86316a4b42
commit 472d796ab2
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/res/res/values/config.xml
View File

@@ -2400,6 +2400,32 @@
in the display pipeline plus some slack just to be sure. --> in the display pipeline plus some slack just to be sure. -->
<integer name="config_drawLockTimeoutMillis">120</integer> <integer name="config_drawLockTimeoutMillis">120</integer>
<!-- An array of device capabilities defined by GSMA SGP.22 v2.0.
The first item is the capability name that the device supports. The second item is the
major version. The minor and revision versions are default to 0s.
The device capabilities and their definition in the spec are:
gsm : gsmSupportedRelease
utran : utranSupportedRelease
cdma1x : cdma2000onexSupportedRelease
hrpd : cdma2000hrpdSupportedRelease
ehrpd : cdma2000ehrpdSupportedRelease
eutran : eutranSupportedRelease
nfc : contactlessSupportedRelease
crl : rspCrlSupportedVersion
-->
<string-array translatable="false" name="config_telephonyEuiccDeviceCapabilities">
<!-- Example:
<item>"gsm,11"</item>
<item>"utran,11"</item>
<item>"cdma1x,1"</item>
<item>"hrpd,3"</item>
<item>"ehrpd,12"</item>
<item>"eutran,11"</item>
<item>"nfc,1"</item>
<item>"crl,1"</item>
-->
</string-array>
<!-- default telephony hardware configuration for this platform. <!-- default telephony hardware configuration for this platform.
--> -->
<!-- this string array should be overridden by the device to present a list <!-- this string array should be overridden by the device to present a list

1
core/res/res/values/symbols.xml
View File

@@ -1195,6 +1195,7 @@
<java-symbol type="array" name="config_disabledUntilUsedPreinstalledCarrierApps" /> <java-symbol type="array" name="config_disabledUntilUsedPreinstalledCarrierApps" />
<java-symbol type="array" name="config_callBarringMMI" /> <java-symbol type="array" name="config_callBarringMMI" />
<java-symbol type="array" name="config_globalActionsList" /> <java-symbol type="array" name="config_globalActionsList" />
<java-symbol type="array" name="config_telephonyEuiccDeviceCapabilities" />
<java-symbol type="array" name="config_telephonyHardware" /> <java-symbol type="array" name="config_telephonyHardware" />
<java-symbol type="array" name="config_keySystemUuidMapping" /> <java-symbol type="array" name="config_keySystemUuidMapping" />
<java-symbol type="array" name="config_gpsParameters" /> <java-symbol type="array" name="config_gpsParameters" />