diff options
| -rw-r--r-- | core/jni/android_os_SELinux.cpp | 20 | ||||
| -rw-r--r-- | core/res/res/values-zh-rCN/cm_strings.xml | 16 | ||||
| -rw-r--r-- | packages/SystemUI/res/values-zh-rCN/cm_strings.xml | 2 |
3 files changed, 26 insertions, 12 deletions
diff --git a/core/jni/android_os_SELinux.cpp b/core/jni/android_os_SELinux.cpp index e813c38..ef3d531 100644 --- a/core/jni/android_os_SELinux.cpp +++ b/core/jni/android_os_SELinux.cpp @@ -335,19 +335,20 @@ namespace android { * Exceptions: None */ static jobjectArray getBooleanNames(JNIEnv *env, JNIEnv clazz) { -#ifdef HAVE_SELINUX - if (isSELinuxDisabled) - return NULL; + jclass stringClass = env->FindClass("java/lang/String"); + jobjectArray stringArray = env->NewObjectArray(0, stringClass, NULL); +#ifdef HAVE_SELINUX char **list; int i, len, ret; - jclass stringClass; - jobjectArray stringArray = NULL; + + if (isSELinuxDisabled) + return stringArray; if (security_get_boolean_names(&list, &len) == -1) - return NULL; + return stringArray; - stringClass = env->FindClass("java/lang/String"); + env->DeleteLocalRef(stringArray); stringArray = env->NewObjectArray(len, stringClass, env->NewStringUTF("")); for (i = 0; i < len; i++) { jstring obj; @@ -357,11 +358,8 @@ namespace android { free(list[i]); } free(list); - - return stringArray; -#else - return NULL; #endif + return stringArray; } /* diff --git a/core/res/res/values-zh-rCN/cm_strings.xml b/core/res/res/values-zh-rCN/cm_strings.xml index e93a25e..0181665 100644 --- a/core/res/res/values-zh-rCN/cm_strings.xml +++ b/core/res/res/values-zh-rCN/cm_strings.xml @@ -48,10 +48,24 @@ <string name="permdesc_fm_radio_transmitter">允许应用控制 FM 发射器。</string> <string name="lockscreen_discharging">正在放电, <xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string> <string name="storage_sd_dock_card">底座 SD 卡</string> - <string name="app_killed_message">应用程序已被终止</string> + <string name="app_killed_message">应用已被终止</string> <string name="global_action_reboot">重启</string> <string name="global_action_choose_profile">情景模式</string> <string name="toast_rotation_unlocked">屏幕方向已解锁</string> <string name="toast_rotation_locked">屏幕方向已锁定</string> <string name="stylus_app_not_installed">%s 尚未被安装</string> + <string name="permlab_changePrivacyGuardState">启用或禁用隐私卫士</string> + <string name="permdesc_changePrivacyGuardState">允许应用更改是否另一个应用可与隐私卫士运行。当一个应用与隐私卫士运行时，它将不能访问任何个人隐私数据，例如：联系人、通话记录或短信。</string> + <string name="privacy_guard_notification">隐私卫士已启用</string> + <string name="privacy_guard_notification_detail">“<xliff:g id="app">%1$s</xliff:g>”将不能访问个人隐私数据</string> + <string name="profile_picker_title">情景模式</string> + <string name="profile_none">无</string> + <string name="permlab_cancelNotifications">取消应用通知</string> + <string name="permdesc_cancelNotifications">允许应用取消别的应用创建的通知。</string> + <string name="permlab_interceptSmsSent">拦截传出的短信</string> + <string name="permdesc_interceptSmsSent">允许应用拦截传出的短信。恶意应用可使用此权限来阻挡传出短信。</string> + <string name="policylab_enforceSelinux">执行 SELinux</string> + <string name="policydesc_enforceSelinux">切换 SELinux 政策执行或许可模式。</string> + <string name="policylab_enforceMmac">执行 MMAC</string> + <string name="policydesc_enforceMmac">切换 MMAC 政策执行或许可模式。</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/cm_strings.xml b/packages/SystemUI/res/values-zh-rCN/cm_strings.xml index 1b938d0..4487eaf 100644 --- a/packages/SystemUI/res/values-zh-rCN/cm_strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/cm_strings.xml @@ -51,8 +51,10 @@ <string name="quick_settings_lte">LTE</string> <string name="quick_settings_lte_off">LTE 已关闭</string> <string name="quick_settings_volume">音量</string> + <string name="quick_settings_camera_label">相机</string> <string name="quick_settings_expanded_desktop">已扩展</string> <string name="quick_settings_expanded_desktop_off">正常</string> + <string name="quick_settings_camera_error_connect">无法连接到相机</string> <string name="navbar_dialog_title">选择指定的行为</string> <string name="navbar_home_button">Home 键</string> <string name="navbar_recent_button">最近应用键</string> |