diff options
author | Steve Kondik <steve@cyngn.com> | 2015-11-16 15:01:23 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-11-16 15:01:23 -0800 |
commit | 3ada4b5a85fa907989855065179c4661653cd9ad (patch) | |
tree | 6f461e770d8a22dfc0d26c8917086df4c31d5905 /core | |
parent | 5ceb8731615dbbd54e027e09e46e724037e3a809 (diff) | |
parent | 5ccaaff4818af8d48e072cbd2b8b784e5cd0c593 (diff) | |
download | frameworks_base-3ada4b5a85fa907989855065179c4661653cd9ad.zip frameworks_base-3ada4b5a85fa907989855065179c4661653cd9ad.tar.gz frameworks_base-3ada4b5a85fa907989855065179c4661653cd9ad.tar.bz2 |
Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/platform/frameworks/base into cm-13.0
Change-Id: I008f052e4e27b44457c8343d20f6e1ba943c8e1f
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/util/NativeTextHelper.java | 92 | ||||
-rw-r--r-- | core/jni/android_util_Binder.cpp | 2 | ||||
-rw-r--r-- | core/jni/com_android_internal_content_NativeLibraryHelper.cpp | 31 | ||||
-rw-r--r-- | core/res/res/values-zh-rCN/strings.xml | 4 | ||||
-rw-r--r-- | core/res/res/values-zh-rHK/strings.xml | 4 | ||||
-rw-r--r-- | core/res/res/values/config.xml | 43 | ||||
-rw-r--r-- | core/res/res/values/customize.xml | 11 | ||||
-rw-r--r-- | core/res/res/values/strings.xml | 6 | ||||
-rw-r--r-- | core/res/res/values/symbols.xml | 16 |
9 files changed, 187 insertions, 22 deletions
diff --git a/core/java/android/util/NativeTextHelper.java b/core/java/android/util/NativeTextHelper.java new file mode 100644 index 0000000..eb380e9 --- /dev/null +++ b/core/java/android/util/NativeTextHelper.java @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2015, The Linux Foundation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of The Linux Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package android.util; + +import android.content.Context; + +/** + *@hide + */ +public class NativeTextHelper { + + /** + * parse the string to current language. + * + * @param context base context of the application + * @param originalString original string + * @param defPackage the target package where the local language strings + * defined + * @param originNamesId the id of the original string array. + * @param localNamesId the id of the local string keys. + * @return local language string + */ + private static final String getLocalString(Context context, String originalString, + String defPackage, int originNamesId, int localNamesId) { + String[] origNames = context.getResources().getStringArray(originNamesId); + String[] localNames = context.getResources().getStringArray(localNamesId); + for (int i = 0; i < origNames.length; i++) { + if (origNames[i].equalsIgnoreCase(originalString)) { + return context.getString(context.getResources().getIdentifier(localNames[i], + "string", defPackage)); + } + } + return originalString; + } + + /** + * parse the string to current language string in public resources. + * + * @param context base context of the application + * @param originalString original string + * @param originNamesId the id of the original string array. + * @param localNamesId the id of the local string keys. + * @return local language string + */ + public static final String getLocalString(Context context, String originalString, + int originNamesId, int localNamesId) { + return getLocalString(context, originalString, "android", originNamesId, localNamesId); + } + + /** + * parse the string to current language string in current resources. + * + * @param context base context of the application + * @param originalString original string + * @param originNamesId the id of the original string array. + * @param localNamesId the id of the local string keys. + * @return local language string + */ + public static final String getInternalLocalString(Context context, String originalString, + int originNamesId, + int localNamesId) { + return getLocalString(context, originalString, context.getPackageName(), originNamesId, + localNamesId); + } + +} diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index c139cd7..9718fd7 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -144,7 +144,7 @@ static volatile int32_t gNumDeathRefs = 0; static void incRefsCreated(JNIEnv* env) { int old = android_atomic_inc(&gNumRefsCreated); - if (old == 200) { + if (old == 2000) { android_atomic_and(0, &gNumRefsCreated); env->CallStaticVoidMethod(gBinderInternalOffsets.mClass, gBinderInternalOffsets.mForceGc); diff --git a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp index 67261d3..c830ffd 100644 --- a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp +++ b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp @@ -499,17 +499,28 @@ static int findSupportedAbi(JNIEnv *env, jlong apkHandle, jobjectArray supported } } } - int asset_status = NO_NATIVE_LIBRARIES; - int rc = initAssetsVerifierLib(); - if (rc == LIB_INITED_AND_SUCCESS) { - asset_status = GetAssetsStatusFunc(zipFile, supportedAbis, numAbis); - } else { - ALOGV("Failed to load assets verifier: %d", rc); - } - if (asset_status == 1) { - // override the status if asset_status hints at 32-bit abi - status = 1; + if(status <= 0) { + // Scan the 'assets' folder only if + // the abi (after scanning the lib folder) + // is not already set to 32-bit (i.e '1' or '2'). + + int asset_status = NO_NATIVE_LIBRARIES; + int rc = initAssetsVerifierLib(); + + if (rc == LIB_INITED_AND_SUCCESS) { + asset_status = GetAssetsStatusFunc(zipFile, supportedAbis, numAbis); + } else { + ALOGV("Failed to load assets verifier: %d", rc); + } + if(asset_status >= 0) { + // Override the ABI only if + // 'asset_status' is a valid ABI (64-bit or 32-bit). + // This is to prevent cases where 'lib' folder + // has native libraries, but + // 'assets' folder has none. + status = asset_status; + } } for (int i = 0; i < numAbis; ++i) { diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 5f51235..563605a 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -1519,4 +1519,8 @@ <item quantity="other">已选择 <xliff:g id="COUNT_1">%1$d</xliff:g> 项</item> <item quantity="one">已选择 <xliff:g id="COUNT_0">%1$d</xliff:g> 项</item> </plurals> + <!-- Carrier Name --> + <string name="China_Mobile">中国移动</string> + <string name="China_Unicom">中国联通</string> + <string name="China_Telecom">中国电信</string> </resources> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index ffa6fb1..188723e 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -1516,4 +1516,8 @@ <item quantity="other">已選取 <xliff:g id="COUNT_1">%1$d</xliff:g> 個項目</item> <item quantity="one">已選取 <xliff:g id="COUNT_0">%1$d</xliff:g> 個項目</item> </plurals> + <!-- Carrier Name --> + <string name="China_Mobile">中國移動</string> + <string name="China_Unicom">中國聯通</string> + <string name="China_Telecom">中國電信</string> </resources> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 57938a1..88362e1 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2500,4 +2500,47 @@ <!-- Support in Surfaceflinger for blur layers. NOTE: This requires additional hardware-specific code. --> <bool name="config_ui_blur_enabled">false</bool> + + <string-array name="origin_carrier_names"> + <item>CHINA\u0020\u0020MOBILE</item> + <item>CMCC</item> + <item>CHN-UNICOM</item> + <item>China Mobile</item> + <item>China Unicom</item> + <item>China Telecom</item> + <item>中国移动</item> + <item>中国联通</item> + <item>中国电信</item> + <item>中國移動</item> + <item>中國聯通</item> + <item>中國電信</item> + <item>Searching for Service</item> + </string-array> + + <string-array name="locale_carrier_names"> + <item>China_Mobile</item> + <item>China_Mobile</item> + <item>China_Unicom</item> + <item>China_Mobile</item> + <item>China_Unicom</item> + <item>China_Telecom</item> + <item>China_Mobile</item> + <item>China_Unicom</item> + <item>China_Telecom</item> + <item>China_Mobile</item> + <item>China_Unicom</item> + <item>China_Telecom</item> + <item>roamingTextSearching</item> + </string-array> + + <!-- monitor locale change --> + <bool name="config_monitor_locale_change">false</bool> + + <!-- display for radio tech --> + <bool name="config_display_rat">false</bool> + + <!-- config 2G/3G/4G RAT strings for carriers --> + <string name="config_rat_2g" translatable="false">2G</string> + <string name="config_rat_3g" translatable="false">3G</string> + <string name="config_rat_4g" translatable="false">4G</string> </resources> diff --git a/core/res/res/values/customize.xml b/core/res/res/values/customize.xml index dc1011b..0cb79cf 100644 --- a/core/res/res/values/customize.xml +++ b/core/res/res/values/customize.xml @@ -29,17 +29,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> <resources> - - <!--Fully qualified class name of the plugin which would be - dynamically loaded by TelephonyPluginDelegate--> - <java-symbol type="string" name="telephony_plugin_class_name" /> - <string name="telephony_plugin_class_name" translatable="false"></string> - - <!--The locatiotion of .jar file which has the extended implementation - of telephony base classes.--> - <java-symbol type="string" name="telephony_plugin_lib_path" /> - <string name="telephony_plugin_lib_path" translatable="false"></string> - <!-- Support for disabling to fetch APN from OMH card for some cdma carriers --> <java-symbol type="bool" name="config_fetch_apn_from_omh_card" /> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 07e8038..4616439 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -265,6 +265,8 @@ <string name="wfc_mode_cellular_preferred_summary">Cellular preferred</string> <!-- WFC, summary for Wi-Fi Only --> <string name="wfc_mode_wifi_only_summary">Wi-Fi only</string> + <!-- Template for showing cellular network operator name while LTE calling is enabled --> + <string name="high_definition_tag">%s</string> <!-- {0} is one of "bearerServiceCode*" @@ -4118,4 +4120,8 @@ for the space allocated to it (two dots). --> <string name="ellipsis_two_dots">\u2025</string> + <!-- Carrier Name --> + <string name="China_Mobile">China Mobile</string> + <string name="China_Unicom">China Unicom</string> + <string name="China_Telecom">China Telecom</string> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index ea8a65b..d69bf59 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1107,6 +1107,7 @@ <java-symbol type="string" name="lockscreen_transport_pause_description" /> <java-symbol type="string" name="config_ethernet_tcp_buffers" /> <java-symbol type="string" name="config_wifi_tcp_buffers" /> + <java-symbol type="string" name="high_definition_tag" /> <java-symbol type="plurals" name="duration_hours" /> <java-symbol type="plurals" name="duration_minutes" /> @@ -2404,4 +2405,19 @@ <java-symbol type="anim" name="last_app_out" /> <java-symbol type="drawable" name="platlogo_m" /> + + <!-- config 2G/3G/4G RAT strings for carriers --> + <java-symbol type="string" name="config_rat_2g" /> + <java-symbol type="string" name="config_rat_3g" /> + <java-symbol type="string" name="config_rat_4g" /> + + <!-- monitor locale change --> + <java-symbol type="bool" name="config_monitor_locale_change" /> + + <!-- display for radio tech --> + <java-symbol type="bool" name="config_display_rat" /> + + <java-symbol type="array" name="origin_carrier_names" /> + <java-symbol type="array" name="locale_carrier_names" /> + </resources> |