0909142256 - Mergebot : Merge manual pull request from upstream sourc…

…e for external_sepolicy with the following commits: commit cbc36489a60bddbee9857aaddb027290e4b22ef8 Author: Steve Kondik <shade@chemlab.org> AuthorDate: Thu Jun 12 02:22:11 2014 -0700 Commit: Steve Kondik <shade@chemlab.org> CommitDate: Thu Jun 12 02:22:11 2014 -0700 sepolicy: Fix a few denials when using backup service Change-Id: Ia5c307a126d42f1dd5952f809f8b4ca1c686a33c commit c22b6c9f022c0f64c7e48067dd5c7fa6ff67d7dd Merge: 4e7819d 9702e49 Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org> AuthorDate: Tue Jun 3 03:05:16 2014 +0100 Commit: Ricardo Cerqueira <cyanogenmod@cerqueira.org> CommitDate: Tue Jun 3 03:05:16 2014 +0100 Merge tag 'android-4.4.3_r1' into HEAD Android 4.4.3 release 1 Change-Id: Ia2768fd8748d3fef11e2e0692e881b4bdb585ee1 commit 9702e49307aa738508bb0949bac3000fe9ec5a0d Author: jaejyn.shin <jaejyn.shin@lge.com> AuthorDate: Tue Dec 24 08:59:53 2013 +0900 Commit: Nick Kralevich <nnk@google.com> CommitDate: Thu Mar 13 16:21:46 2014 -0700 DO NOT MERGE: Adding permissions needed to remove cache During removing cache data using Zipper application, I found violation logs. avc: denied { write } for pid=198 comm="installd" name="cache" dev="mmcblk0p29" ino=81680 scontext=u:r:installd:s0 tcontext=u:object_r:download_file:s0 tclass=dir avc: denied { remove_name } for pid=198 comm="installd" name="downloadfile.apk" dev="mmcblk0p29" ino=82247 scontext=u:r:installd:s0 tcontext=u:object_r:download_file:s0 tclass=dir avc: denied { unlink } for pid=198 comm="installd" name="downloadfile.apk" dev="mmcblk0p29" ino=82247 scontext=u:r:installd:s0 tcontext=u:object_r:download_file:s0 tclass=file Reproduction path is like below 1. Downloading Zipper application from Google Play (I used Zipper 1.9.9.2) 2. Clicking option and clicking "removing cache" button 3. Select "yes" 4. Violation show up (cherry picked from commit 9cc6d8d581b6094b36c59a0e95d674cb193916e8) Bug: 13450421 Change-Id: I487ccd1d8d58bf2c590af39a7b1eb448c113670e commit 2a2a4936c2223e9b3a70b177a97c270aa1aa2740 Author: Takeshi Aimi <takeshi.aimi@sonymobile.com> AuthorDate: Tue Nov 26 20:19:08 2013 +0900 Commit: Nick Kralevich <nnk@google.com> CommitDate: Thu Mar 13 16:21:38 2014 -0700 DO NOT MERGE: Make bluetooth, nfc, radio and shell adb-installable bluetooth, nfc, radio and shell are not explicitly declared in installd.te. This prevents applications in those group from upgrading by "adb install -r". You can reproduce the issue by following step: 1. adb pull /system/priv-app/Shell.apk 2. adb install -r Shell.apk 3. install failed with the error log blow [Error in logcat] E/installd( 338): couldn't symlink directory '/data/data/com.android.shell/lib' -> '/data/app-lib/com.android.shell-1': Permission denied E/installd( 338): couldn't symlink directory '/data/data/com.android.shell/lib' -> '/data/app-lib/Shell': Permission denied [Error in dmesg] <5>[ 112.053301] type=1400 audit(1387412796.071:10): avc: denied { create } for pid=337 comm="installd" name="lib" scontext=u:r:installd:s0 tcontext=u:object_r:shell_data_file:s0 tclass=lnk_file This operation fails only if the app belongs to any of the groups specified in the commit title. (cherry picked from commit f5e90004a30a2cb5c1a1d70134a32d68994e2568) Bug: 13450421 Change-Id: Ie38d05c1306bebd90b0f15c1d4e1a55f6798d497
cmbroms · Sep 10, 2014 · 079ecfa · 079ecfa
1 parent 65d4676
commit 079ecfa
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 118 deletions.
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
@@ -89,9 +89,4 @@
   <string name="incoming_call_style_title">Estil de la pantalla de trucada entrant</string>
   <string name="incoming_call_style_classic">Clàssica</string>
   <string name="incoming_call_style_fullscreen_photo">Foto de la trucada en pantalla sencera</string>
-  <string name="title_sim_prompt_dlg">Mode avió</string>
-  <string name="msg_sim_prompt_dlg">El mode avió està activat. Vols desactivar-lo?</string>
-  <string name="msg_wait_prodlg">S\'està desactivant el mode avió\u2026</string>
-  <string name="network_forbidden">(Prohibit)</string>
-  <string name="fdn_empty_number">FDN no actualitzat: el número no pot estar buit.</string>
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
@@ -89,9 +89,4 @@
   <string name="incoming_call_style_title">Στυλ εισερχόμενης κλήσης</string>
   <string name="incoming_call_style_classic">Κλασικό</string>
   <string name="incoming_call_style_fullscreen_photo">Φωτογραφία καλούντος σε πλήρη οθόνη</string>
-  <string name="title_sim_prompt_dlg">Λειτουργία πτήσης</string>
-  <string name="msg_sim_prompt_dlg">Η λειτουργία πτήσης είναι ενεργή. Απενεργοποίηση;</string>
-  <string name="msg_wait_prodlg">Απενεργοποίηση λειτουργίας πτήσης\u2026</string>
-  <string name="network_forbidden">(Απαγορευμένο)</string>
-  <string name="fdn_empty_number">Το FDN δεν ενημερώθηκε: ο αριθμός δεν μπορεί να είναι κενός.</string>
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
@@ -89,9 +89,4 @@
   <string name="incoming_call_style_title">Estilo de pantalla en llamada entrante</string>
   <string name="incoming_call_style_classic">Clásico</string>
   <string name="incoming_call_style_fullscreen_photo">Foto a pantalla completa</string>
-  <string name="title_sim_prompt_dlg">Modo avión</string>
-  <string name="msg_sim_prompt_dlg">Modo avión habilitado. ¿Deshabilitar?</string>
-  <string name="msg_wait_prodlg">Deshabilitando el modo avión\u2026</string>
-  <string name="network_forbidden">(Prohibida)</string>
-  <string name="fdn_empty_number">FDN no actualizado: el número no puede quedar vacío.</string>
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
@@ -89,9 +89,4 @@
   <string name="incoming_call_style_title">Saapuvan puhelun näytön tyyli</string>
   <string name="incoming_call_style_classic">Klassinen</string>
   <string name="incoming_call_style_fullscreen_photo">Soittajan kuva koko näytöllä</string>
-  <string name="title_sim_prompt_dlg">Lentotila</string>
-  <string name="msg_sim_prompt_dlg">Lentotila käytössä. Poistetaanko käytöstä?</string>
-  <string name="msg_wait_prodlg">Poistetaan lentotilaa käytöstä\u2026</string>
-  <string name="network_forbidden">(Kielletty)</string>
-  <string name="fdn_empty_number">FDN ei päivitetty: numero ei voi olla tyhjä.</string>
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
@@ -36,7 +36,7 @@
   <string name="vibrate_hangup">通話終了時のバイブレーション</string>
   <string name="vibrate_45">時間ごとのバイブレーション</string>
   <string name="vibrate_45_sum">発信中に45秒ごとに振動する</string>
-  <string name="show_ssn_label">イベント通知</string>
+  <string name="show_ssn_label">イベントの通知</string>
   <string name="show_ssn_summary">通話の処理に関連するさまざまなネットワークイベントの通知を表示する</string>
   <string name="blacklist_title">ブラックリスト</string>
   <string name="blacklist_summary_disabled">無効</string>
@@ -80,7 +80,7 @@
   <string name="choose_people_lookup_provider_title">人物検索プロバイダ</string>
   <string name="choose_reverse_lookup_provider_title">逆引き検索プロバイダ</string>
   <string name="sub_no_sim">SIMがありません</string>
-  <string name="msim_call_selector_title">経由で<xliff:g id="number">%s</xliff:g>に発信</string>
+  <string name="msim_call_selector_title"><xliff:g id="number">%s</xliff:g>に発信するSIM</string>
   <string name="msim_call_selector_item">SIM<xliff:g id="index">%1$d</xliff:g>: <xliff:g id="operator">%2$s</xliff:g></string>
   <string name="cyngn_reverse_lookup_provider_name">Cyngn Chinese（CN）</string>
   <string name="preference_category_t9_dialpad_search">ダイアルパッドT9検索</string>
@@ -89,9 +89,4 @@
   <string name="incoming_call_style_title">着信画面のスタイル</string>
   <string name="incoming_call_style_classic">クラシック</string>
   <string name="incoming_call_style_fullscreen_photo">発信者のフルスクリーン写真</string>
-  <string name="title_sim_prompt_dlg">機内モード</string>
-  <string name="msg_sim_prompt_dlg">機内モードが有効です。無効にしますか？</string>
-  <string name="msg_wait_prodlg">機内モードを無効にしています\u2026</string>
-  <string name="network_forbidden">（禁止）</string>
-  <string name="fdn_empty_number">FDNは更新されていません: 番号は空にできません。</string>
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
@@ -89,9 +89,4 @@
   <string name="incoming_call_style_title">전화 수신 화면 스타일</string>
   <string name="incoming_call_style_classic">클래식</string>
   <string name="incoming_call_style_fullscreen_photo">전체 화면 발신자 사진</string>
-  <string name="title_sim_prompt_dlg">비행기 모드</string>
-  <string name="msg_sim_prompt_dlg">비행기 모드가 켜져 있습니다. 비활성화할까요?</string>
-  <string name="msg_wait_prodlg">비행기 모드를 비활성화하는 중\u2026</string>
-  <string name="network_forbidden">(금지됨)</string>
-  <string name="fdn_empty_number">FDN이 갱신되지 않았습니다. 전화번호는 비워둘 수 없습니다.</string>
 </resources>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
@@ -234,7 +234,7 @@
   <string name="list_language_summary">زمانی هەواڵەکان هەڵبژێرە</string>
   <string-array name="list_language_entries">
     <item>ئينگليزى</item>
-    <item>فه‌ڕه‌نسی</item>
+    <item>فه‌ره‌نسی</item>
     <item>ئیسپانی</item>
     <item>ژاپۆنی</item>
     <item>کۆری</item>

diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
@@ -89,9 +89,4 @@
   <string name="incoming_call_style_title">Estilo de ecrã de chamada recebida</string>
   <string name="incoming_call_style_classic">Padrão</string>
   <string name="incoming_call_style_fullscreen_photo">Foto de contacto no ecrã inteiro</string>
-  <string name="title_sim_prompt_dlg">Modo de avião</string>
-  <string name="msg_sim_prompt_dlg">Modo avião ativado. Desativar?</string>
-  <string name="msg_wait_prodlg">A desativar o modo de avião\u2026</string>
-  <string name="network_forbidden">(Proibido)</string>
-  <string name="fdn_empty_number">FDN não atualizado: o número não pode estar vazio.</string>
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
@@ -89,9 +89,4 @@
   <string name="incoming_call_style_title">Stilul ecranului unui apel în desfășurare</string>
   <string name="incoming_call_style_classic">Clasic</string>
   <string name="incoming_call_style_fullscreen_photo">Fotografia apelantului pe tot ecranul</string>
-  <string name="title_sim_prompt_dlg">Mod avion</string>
-  <string name="msg_sim_prompt_dlg">Modul avion activat. Dezactivează?</string>
-  <string name="msg_wait_prodlg">Se dezactivează modul avion\u2026</string>
-  <string name="network_forbidden">(Interzis)</string>
-  <string name="fdn_empty_number">FDN nu este actualizat: numărul nu poate fi gol.</string>
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
@@ -89,9 +89,4 @@
   <string name="incoming_call_style_title">Стиль экрана входящего вызова</string>
   <string name="incoming_call_style_classic">Классический</string>
   <string name="incoming_call_style_fullscreen_photo">Фото звонящего на весь экран</string>
-  <string name="title_sim_prompt_dlg">Режим полёта</string>
-  <string name="msg_sim_prompt_dlg">Включён режим полёта. Отключить его?</string>
-  <string name="msg_wait_prodlg">Отключение режима полёта\u2026</string>
-  <string name="network_forbidden">(Запрещено)</string>
-  <string name="fdn_empty_number">Список фикс. набора не изменён: номер не может быть пустым.</string>
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
@@ -89,9 +89,4 @@
   <string name="incoming_call_style_title">Štýl obrazovky prichádzajúceho hovoru</string>
   <string name="incoming_call_style_classic">Klasický</string>
   <string name="incoming_call_style_fullscreen_photo">Fotografia volajúceho na celú obrazovku</string>
-  <string name="title_sim_prompt_dlg">Režim V lietadle</string>
-  <string name="msg_sim_prompt_dlg">Režimu v lietadle je zapnutý. Vypnúť?</string>
-  <string name="msg_wait_prodlg">Vypínanie režimu V lietadle\u2026</string>
-  <string name="network_forbidden">(Zakázaná)</string>
-  <string name="fdn_empty_number">Číslo pevného vytáčania nebolo aktualizované: číslo nemôže byť prázdne.</string>
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
@@ -89,9 +89,4 @@
   <string name="incoming_call_style_title">Стил екрана за долазни позив</string>
   <string name="incoming_call_style_classic">Класични</string>
   <string name="incoming_call_style_fullscreen_photo">Слика позиваоца преко целог екрана</string>
-  <string name="title_sim_prompt_dlg">Режим рада у авиону</string>
-  <string name="msg_sim_prompt_dlg">Режим рада у авиону омогућен. Онемогућити?</string>
-  <string name="msg_wait_prodlg">Онемогућавање режима рада у авиону\u2026</string>
-  <string name="network_forbidden">(Забрањено)</string>
-  <string name="fdn_empty_number">FDN није ажуриран: број не може бити празан.</string>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
@@ -89,62 +89,4 @@
   <string name="incoming_call_style_title">来电屏幕样式</string>
   <string name="incoming_call_style_classic">经典</string>
   <string name="incoming_call_style_fullscreen_photo">全屏来电者照片</string>
-  <string name="title_sim_prompt_dlg">飞行模式</string>
-  <string name="msg_sim_prompt_dlg">飞行模式已开启，你想关闭飞行模式吗？</string>
-  <string name="msg_wait_prodlg">正在关闭飞行模式</string>
-  <string name="network_forbidden">(禁用)</string>
-  <string name="fdn_empty_number">"FDN 未更新：号码不能为空。"</string>
-  <string name="proximity_mode_title">"打开距离传感器"</string>
-  <string name="proximity_on_summary">"接听电话时，屏幕会关闭，从而节省电量"</string>
-  <string name="proximity_off_summary">"接听电话时，屏幕保持开启状态"</string>
-  <string name="call_barring">呼叫限制</string>
-  <string name="call_barring_outgoing">呼出限制</string>
-  <string-array name="call_barring_outgoing_display_values">
-    <item>"关闭"</item>
-    <item>"限制国际漫游呼叫"</item>
-    <item>"限制国际呼叫"</item>
-    <item>"限制呼叫"</item>
-  </string-array>
-  <string-array name="call_barring_incoming_display_values">
-    <item>"关闭"</item>
-    <item>"限制漫游时来电"</item>
-    <item>"限制来电"</item>
-  </string-array>
-  <string name="call_barring_incoming">呼入限制</string>
-  <string name="input_password">输入密码</string>
-  <string name="labelCbCancelAll">取消全部限制</string>
-  <string name="psw_enter_old">旧密码</string>
-  <string name="labelCbChangePassword">修改限制密码</string>
-  <string name="psw_enter_new">新密码</string>
-  <string name="invalidPsw">输入 4 到 8 位数字的密码。</string>
-  <string name="psw_reenter_new">重新输入新密码</string>
-  <string name="no_call_barring">没有设置呼叫限制</string>
-  <string name="cb_psw_dont_match">密码不匹配！</string>
-  <string name="operation_successfully">操作成功！</string>
-  <string name="emergency_call_list_title">紧急电话</string>
-  <string name="emergency_call">拨打紧急电话</string>
-  <string name="new_emergency_number">添加紧急电话</string>
-  <string name="delete_emergency_number">删除紧急电话</string>
-  <string name="emergency_call_number">紧急电话号码</string>
-  <string name="emergency_number_exist">紧急电话已存在!</string>
-  <string name="emergency_number_save_error">紧急电话号码太长!</string>
-  <string name="ipcall">IP电话设置</string>
-  <string name="ipcall_sub_title">IP电话设置</string>
-  <string name="ipcall_sub_summery">修改IP电话前缀</string>
-  <string name="ipcall_dialog_title">IP电话设置</string>
-  <string name="ipcall_dialog_edit_hint">请输入IP电话前缀</string>
-  <string name="notification_missedVideoCallTitle">未接可视电话</string>
-  <string name="notification_missedVideoCallsTitle">未接可视电话</string>
-  <string name="notification_missedVideoCallsMsg"><xliff:g id="num_missed_calls">%1$s</xliff:g>个未接可视电话</string>
-  <string name="notification_missedVideoCallTicker">未接可视电话来自<xliff:g id="missed_call_from">%1$s</xliff:g></string>
-  <string name="CFActivate">激活</string>
-  <string name="CFDeactivate">禁用</string>
-  <string name="null_phone_number">输入的电话号码不能为空!</string>
-  <string name="labelCFDeactAll">全部禁用</string>
-  <string name="uplmn_list_setting_title">偏好设置</string>
-  <string name="network_id">网络 ID</string>
-  <string name="dialog_network_priority_title">优先级</string>
-  <string name="uplmn_list_setting_add_plmn">新增 PLMN</string>
-  <string name="gsm_umts_network_preferences_title">网络模式</string>
-  <string name="gsm_umts_network_preferences_dialogtitle">网络模式</string>
 </resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
@@ -28,8 +28,8 @@
   <string name="call_notif_multipartycall">多方通話</string>
   <string name="call_notif_callonhold_released">通話被對方釋放</string>
   <string name="call_notif_forwardcheckreceived">通話被轉駁</string>
-  <string name="call_notif_callconnectingect">致電通過顯式的來電轉接進行連接</string>
-  <string name="call_notif_callconnectedect">致電通過顯式的來電轉接進行連接</string>
+  <string name="call_notif_callconnectingect">致電透過顯式的來電轉接進行連接</string>
+  <string name="call_notif_callconnectedect">致電透過顯式的來電轉接進行連接</string>
   <string name="incall_vibration">通話震動</string>
   <string name="vibrate_outgoing">當接聽時震動</string>
   <string name="vibrate_call_waiting">當通話等待時震動</string>

diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
@@ -18,6 +18,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="call_notif_unconditionalCF">無限制來電轉接啟用中</string>
   <string name="call_notif_conditionalCF">限制來電轉接啟用中</string>
+  <string name="call_notif_multipartycall">多方通話</string>
   <string name="incall_vibration">通話震動</string>
   <string name="blacklist_title">黑名單</string>
   <string name="blacklist_summary_disabled">已停用</string>
@@ -31,6 +32,9 @@
   <string name="enable_people_lookup_summary">在撥號器中搜索時，即時顯示搜索聯絡人結果</string>
   <string name="enable_reverse_lookup_summary">為未知來電號碼查詢聯絡人或地點資料</string>
   <string name="sub_no_sim">沒有 SIM 卡</string>
+  <string name="msim_call_selector_item">SIM卡<xliff:g id="index">%1$d</xliff:g>：<xliff:g id="operator">%2$s</xliff:g></string>
   <string name="cyngn_reverse_lookup_provider_name">Cyngn 中國（CN）</string>
   <string name="t9_search_input_locale_default">預設</string>
+  <string name="incoming_call_style_classic">預設</string>
+  <string name="incoming_call_style_fullscreen_photo">全螢幕來電者相片</string>
 </resources>