Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 5 commits
  • 7 files changed
  • 0 comments
  • 5 contributors
Jun 26, 2012
Takuo Kitame takuo Japanese: translation of 'profile' related entries.
Change-Id: I2da29d5bc33a68123b5cc38e82a2cb57fde2774e
e7a6afb
Marco Brohet (cobje) therbom frameworks: Dutch translations
Change-Id: I45418c4172c97f430efbf736af0c61854f99c956
930923a
Daniel Hillenbrand codeworkx Smdk4210Ril: fix bad file format
Change-Id: I26a48a1422060a19c76fbc83af95ae7649442bf0
a56ef14
Daniel Bateman FaultException framework: customizable kill app via back key timeout
Allows the time it takes for the back key to kill an app
to be customized via overlay.

Change-Id: Iaa43f81ee448ae7a7663254a830011a0bca5e60f
9fe6f94
Pawit Pornkitprasan pawitp Revert "libstagefright: Fix MPEG4 timestamp"
A lot of applications (e.g. QuickTime, mkvmerge) apparently does not like the 64-bit timestamp and will fail to open the file.

This reverts commit 893586d
45c68a0
19 core/res/res/values-ja/strings.xml
@@ -1256,9 +1256,28 @@
1256 1256
1257 1257 <!-- label for item that reboots the phone in phone options dialog -->
1258 1258 <string name="global_action_reboot">再起動</string>
  1259 + <!-- label for item that reboots the phone in phone options dialog -->
  1260 + <string name="global_action_choose_profile">プロファイル選択</string>
1259 1261 <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
1260 1262 <string name="permlab_preventpower">電源キーを保護</string>
1261 1263 <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
1262 1264 <string name="permdesc_preventpower">アプリケーションが電源キーを置き換えるのを許可する</string>
1263 1265
  1266 + <!-- Names of default profiles. -->
  1267 + <string name="profileNameDefault">デフォルト</string>
  1268 + <string name="profileNameWork">仕事</string>
  1269 + <string name="profileNameHome">自宅</string>
  1270 + <string name="profileNameSilent">サイレント</string>
  1271 + <string name="profileNameNight">夜</string>
  1272 +
  1273 + <!-- Names of application groups. -->
  1274 + <string name="profileGroupPhone">電話</string>
  1275 + <string name="profileGroupCalendar">カレンダー</string>
  1276 + <string name="profileGroupGmail">Gmail</string>
  1277 + <string name="profileGroupEmail">Eメール</string>
  1278 + <string name="profileGroupSMS">SMS</string>
  1279 +
  1280 + <!-- Name of wildcard profile. -->
  1281 + <string name="wildcardProfile">その他</string>
  1282 +
1264 1283 </resources>
162 core/res/res/values-nl/strings.xml
@@ -13,7 +13,6 @@
13 13 See the License for the specific language governing permissions and
14 14 limitations under the License.
15 15 -->
16   -<!-- //device/apps/common/assets/res/any/strings.xml -->
17 16 <resources xmlns:android="http://schemas.android.com/apk/res/android"
18 17 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
19 18 <string name="byteShort" msgid="8340973892742019101">"B"</string>
@@ -44,8 +43,8 @@
44 43 <string name="mismatchPin" msgid="3695902225843339274">"De PIN-codes die u heeft ingevoerd, komen niet overeen."</string>
45 44 <string name="invalidPin" msgid="3850018445187475377">"Voer een PIN-code van 4 tot 8 cijfers in."</string>
46 45 <string name="invalidPuk" msgid="8761456210898036513">"Typ een PUK-code die 8 cijfers of langer is."</string>
47   - <string name="needPuk" msgid="919668385956251611">"Uw SIM-kaart is vergrendeld met de PUK-code. Typ de PUK-code om te ontgrendelen."</string>
48   - <string name="needPuk2" msgid="4526033371987193070">"Voer de PUK2-code in om de SIM-kaart te ontgrendelen."</string>
  46 + <string name="needPuk" msgid="919668385956251611">"Uw simkaart is vergrendeld met de PUK-code. Typ de PUK-code om te ontgrendelen."</string>
  47 + <string name="needPuk2" msgid="4526033371987193070">"Voer de PUK2-code in om de simkaart te ontgrendelen."</string>
49 48 <string name="ClipMmi" msgid="6952821216480289285">"Inkomende beller-id"</string>
50 49 <string name="ClirMmi" msgid="7784673673446833091">"Uitgaande beller-id"</string>
51 50 <string name="CfMmi" msgid="5123218989141573515">"Oproep doorschakelen"</string>
@@ -70,14 +69,14 @@
70 69 <string name="RestrictedOnEmergency" msgid="6581163779072833665">"Alarmservice is geblokkeerd."</string>
71 70 <string name="RestrictedOnNormal" msgid="4953867011389750673">"Spraakservice is geblokkeerd."</string>
72 71 <string name="RestrictedOnAllVoice" msgid="1459318899842232234">"Alle spraakservices zijn geblokkeerd."</string>
73   - <string name="RestrictedOnSms" msgid="8314352327461638897">"SMS-service is geblokkeerd."</string>
  72 + <string name="RestrictedOnSms" msgid="8314352327461638897">"Sms-service is geblokkeerd."</string>
74 73 <string name="RestrictedOnVoiceData" msgid="8244438624660371717">"Spraak-/gegevensservices zijn geblokkeerd."</string>
75   - <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Spraak-/SMS-services zijn geblokkeerd."</string>
76   - <string name="RestrictedOnAll" msgid="2714924667937117304">"Alle spraak-/gegevens-/SMS-services zijn geblokkeerd."</string>
  74 + <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Spraak-/sms-services zijn geblokkeerd."</string>
  75 + <string name="RestrictedOnAll" msgid="2714924667937117304">"Alle spraak-/gegevens-/sms-services zijn geblokkeerd."</string>
77 76 <string name="serviceClassVoice" msgid="1258393812335258019">"Spraak"</string>
78 77 <string name="serviceClassData" msgid="872456782077937893">"Gegevens"</string>
79 78 <string name="serviceClassFAX" msgid="5566624998840486475">"FAX"</string>
80   - <string name="serviceClassSMS" msgid="2015460373701527489">"SMS"</string>
  79 + <string name="serviceClassSMS" msgid="2015460373701527489">"Sms"</string>
81 80 <string name="serviceClassDataAsync" msgid="4523454783498551468">"Asynchroon"</string>
82 81 <string name="serviceClassDataSync" msgid="7530000519646054776">"Synchroniseren"</string>
83 82 <string name="serviceClassPacket" msgid="6991006557993423453">"Pakket"</string>
@@ -149,16 +148,16 @@
149 148 <string name="global_action_toggle_silent_mode" msgid="8219525344246810925">"Stille modus"</string>
150 149 <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"Geluid is UIT"</string>
151 150 <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"Geluid is AAN"</string>
152   - <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Vliegmodus"</string>
153   - <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Vliegmodus is AAN"</string>
154   - <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Vliegmodus is UIT"</string>
  151 + <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Vliegtuigmodus"</string>
  152 + <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Vliegtuigmodus is AAN"</string>
  153 + <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Vliegtuigmodus is UIT"</string>
155 154 <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999 +"</string>
156 155 <string name="safeMode" msgid="2788228061547930246">"Veilige modus"</string>
157 156 <string name="android_system_label" msgid="6577375335728551336">"Android-systeem"</string>
158 157 <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Services waarvoor u moet betalen"</string>
159 158 <string name="permgroupdesc_costMoney" msgid="8193824940620517189">"Toepassingen toestaan activiteiten uit te voeren waarvoor mogelijk kosten in rekening worden gebracht."</string>
160 159 <string name="permgrouplab_messages" msgid="7521249148445456662">"Uw berichten"</string>
161   - <string name="permgroupdesc_messages" msgid="7045736972019211994">"SMS, e-mail en andere berichten lezen en schrijven."</string>
  160 + <string name="permgroupdesc_messages" msgid="7045736972019211994">"Sms, e-mail en andere berichten lezen en schrijven."</string>
162 161 <string name="permgrouplab_personalInfo" msgid="3519163141070533474">"Uw persoonlijke informatie"</string>
163 162 <string name="permgroupdesc_personalInfo" product="tablet" msgid="6975389054186265786">"Rechtstreekse toegang tot de op uw tablet opgeslagen contacten en agenda."</string>
164 163 <string name="permgroupdesc_personalInfo" product="default" msgid="5488050357388806068">"Rechtstreekse toegang tot de op uw telefoon opgeslagen contacten en agenda."</string>
@@ -187,22 +186,22 @@
187 186 <string name="permdesc_expandStatusBar" msgid="7088604400110768665">"Hiermee kan de app de statusbalk uitvouwen of samenvouwen."</string>
188 187 <string name="permlab_processOutgoingCalls" msgid="1136262550878335980">"uitgaande oproepen onderscheppen"</string>
189 188 <string name="permdesc_processOutgoingCalls" msgid="2228988201852654461">"Hiermee kan een app uitgaande oproepen verwerken en het nummer wijzigen dat wordt gebeld. Schadelijke apps kunnen uitgaande oproepen bijhouden, omleiden of tegenhouden."</string>
190   - <string name="permlab_receiveSms" msgid="2697628268086208535">"SMS ontvangen"</string>
191   - <string name="permdesc_receiveSms" msgid="6298292335965966117">"Hiermee kan een app SMS-berichten ontvangen en verwerken. Schadelijke apps kunnen uw berichten bijhouden of deze verwijderen zonder dat u ze te zien krijgt."</string>
192   - <string name="permlab_receiveMms" msgid="8894700916188083287">"MMS ontvangen"</string>
193   - <string name="permdesc_receiveMms" msgid="4563346832000174373">"Hiermee kan een app MMS-berichten ontvangen en verwerken. Schadelijke apps kunnen uw berichten bijhouden of deze verwijderen zonder dat u ze te zien krijgt."</string>
  189 + <string name="permlab_receiveSms" msgid="2697628268086208535">"Sms ontvangen"</string>
  190 + <string name="permdesc_receiveSms" msgid="6298292335965966117">"Hiermee kan een app sms-berichten ontvangen en verwerken. Schadelijke apps kunnen uw berichten bijhouden of deze verwijderen zonder dat u ze te zien krijgt."</string>
  191 + <string name="permlab_receiveMms" msgid="8894700916188083287">"Mms ontvangen"</string>
  192 + <string name="permdesc_receiveMms" msgid="4563346832000174373">"Hiermee kan een app mms-berichten ontvangen en verwerken. Schadelijke apps kunnen uw berichten bijhouden of deze verwijderen zonder dat u ze te zien krijgt."</string>
194 193 <string name="permlab_receiveEmergencyBroadcast" msgid="1803477660846288089">"noodberichten ontvangen"</string>
195 194 <string name="permdesc_receiveEmergencyBroadcast" msgid="7118393393716546131">"Hiermee kan een app noodberichten ontvangen en verwerken. Deze toestemming is alleen beschikbaar voor systeemapps."</string>
196   - <string name="permlab_sendSms" msgid="5600830612147671529">"SMS-berichten verzenden"</string>
197   - <string name="permdesc_sendSms" msgid="1946540351763502120">"Hiermee kan de app SMS-berichten verzenden. Schadelijke apps kunnen u geld kosten door berichten te verzenden zonder uw toestemming."</string>
  195 + <string name="permlab_sendSms" msgid="5600830612147671529">"Sms-berichten verzenden"</string>
  196 + <string name="permdesc_sendSms" msgid="1946540351763502120">"Hiermee kan de app sms-berichten verzenden. Schadelijke apps kunnen u geld kosten door berichten te verzenden zonder uw toestemming."</string>
198 197 <string name="permlab_sendSmsNoConfirmation" msgid="4781483105951730228">"zonder toestemming sms\'jes verzenden"</string>
199 198 <string name="permdesc_sendSmsNoConfirmation" msgid="4477752891276276168">"Hiermee kan de app sms\'jes verzenden. Schadelijke apps kunnen u geld kosten door zonder uw toestemming berichten te verzenden."</string>
200   - <string name="permlab_readSms" msgid="4085333708122372256">"SMS of MMS lezen"</string>
201   - <string name="permdesc_readSms" product="tablet" msgid="5836710350295631545">"Hiermee kan een app de op uw tablet of SIM-kaart opgeslagen SMS-berichten lezen. Schadelijke apps kunnen uw vertrouwelijke berichten mogelijk lezen."</string>
202   - <string name="permdesc_readSms" product="default" msgid="3002170087197294591">"Hiermee kan een app de op uw telefoon of SIM-kaart opgeslagen SMS-berichten lezen. Schadelijke apps kunnen uw vertrouwelijke berichten mogelijk lezen."</string>
203   - <string name="permlab_writeSms" msgid="6881122575154940744">"SMS of MMS bewerken"</string>
204   - <string name="permdesc_writeSms" product="tablet" msgid="5332124772918835437">"Hiermee kan een app naar de op uw tablet of SIM-kaart opgeslagen SMS-berichten schrijven. Schadelijke apps kunnen uw berichten mogelijk verwijderen."</string>
205   - <string name="permdesc_writeSms" product="default" msgid="6299398896177548095">"Hiermee kan een app naar de op uw telefoon of SIM-kaart opgeslagen SMS-berichten schrijven. Schadelijke apps kunnen uw berichten mogelijk verwijderen."</string>
  199 + <string name="permlab_readSms" msgid="4085333708122372256">"Sms of mms lezen"</string>
  200 + <string name="permdesc_readSms" product="tablet" msgid="5836710350295631545">"Hiermee kan een app de op uw tablet of simkaart opgeslagen sms-berichten lezen. Schadelijke apps kunnen uw vertrouwelijke berichten mogelijk lezen."</string>
  201 + <string name="permdesc_readSms" product="default" msgid="3002170087197294591">"Hiermee kan een app de op uw telefoon of simkaart opgeslagen sms-berichten lezen. Schadelijke apps kunnen uw vertrouwelijke berichten mogelijk lezen."</string>
  202 + <string name="permlab_writeSms" msgid="6881122575154940744">"Sms of mms bewerken"</string>
  203 + <string name="permdesc_writeSms" product="tablet" msgid="5332124772918835437">"Hiermee kan een app naar de op uw tablet of simkaart opgeslagen sms-berichten schrijven. Schadelijke apps kunnen uw berichten mogelijk verwijderen."</string>
  204 + <string name="permdesc_writeSms" product="default" msgid="6299398896177548095">"Hiermee kan een app naar de op uw telefoon of simkaart opgeslagen sms-berichten schrijven. Schadelijke apps kunnen uw berichten mogelijk verwijderen."</string>
206 205 <string name="permlab_receiveWapPush" msgid="8258226427716551388">"WAP ontvangen"</string>
207 206 <string name="permdesc_receiveWapPush" msgid="5979623826128082171">"Hiermee kan een app WAP-berichten ontvangen en verwerken. Schadelijke apps kunnen uw berichten bijhouden of deze verwijderen zonder dat u ze te zien krijgt."</string>
208 207 <string name="permlab_getTasks" msgid="5005277531132573353">"actieve apps ophalen"</string>
@@ -235,10 +234,10 @@
235 234 <string name="permdesc_runSetActivityWatcher" msgid="2149363027173451218">"Hiermee kan een app de manier waarop het systeem activiteiten start, bijhouden en beheren. Schadelijke apps kunnen het systeem volledig in gevaar brengen. Deze machtiging is alleen voor ontwikkeling vereist, nooit voor normaal gebruik."</string>
236 235 <string name="permlab_broadcastPackageRemoved" msgid="2576333434893532475">"melding verzenden dat pakket is verwijderd"</string>
237 236 <string name="permdesc_broadcastPackageRemoved" msgid="3453286591439891260">"Hiermee kan een app een melding verzenden dat een app-pakket (APK) is verwijderd. Schadelijke apps kunnen hiervan gebruik maken om alle andere actieve apps af te sluiten."</string>
238   - <string name="permlab_broadcastSmsReceived" msgid="5689095009030336593">"melding over ontvangen SMS-bericht verzenden"</string>
239   - <string name="permdesc_broadcastSmsReceived" msgid="9122419277306740155">"Hiermee kan een app een melding verzenden dat een SMS-bericht is ontvangen. Schadelijke apps kunnen hiervan gebruik maken om inkomende SMS-berichten te vervalsen."</string>
  237 + <string name="permlab_broadcastSmsReceived" msgid="5689095009030336593">"melding over ontvangen sms-bericht verzenden"</string>
  238 + <string name="permdesc_broadcastSmsReceived" msgid="9122419277306740155">"Hiermee kan een app een melding verzenden dat een sms-bericht is ontvangen. Schadelijke apps kunnen hiervan gebruik maken om inkomende sms-berichten te vervalsen."</string>
240 239 <string name="permlab_broadcastWapPush" msgid="3145347413028582371">"melding over ontvangen WAP-PUSH-bericht verzenden"</string>
241   - <string name="permdesc_broadcastWapPush" msgid="3955303669461378091">"Hiermee kan een app een melding verzenden dat een WAP PUSH-bericht is ontvangen. Schadelijke apps kunnen hiervan gebruik maken om een valse MMS-ontvangst te melden of de inhoud van willekeurige webpagina\'s door schadelijke varianten te vervangen."</string>
  240 + <string name="permdesc_broadcastWapPush" msgid="3955303669461378091">"Hiermee kan een app een melding verzenden dat een WAP PUSH-bericht is ontvangen. Schadelijke apps kunnen hiervan gebruik maken om een valse mms-ontvangst te melden of de inhoud van willekeurige webpagina\'s door schadelijke varianten te vervangen."</string>
242 241 <string name="permlab_setProcessLimit" msgid="2451873664363662666">"aantal actieve processen beperken"</string>
243 242 <string name="permdesc_setProcessLimit" msgid="7824786028557379539">"Hiermee kan een app het maximum aantal processen bepalen dat wordt uitgevoerd. Nooit vereist voor normale apps."</string>
244 243 <string name="permlab_setAlwaysFinish" msgid="5342837862439543783">"alle achtergrondapps sluiten"</string>
@@ -590,7 +589,7 @@
590 589 <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Mobiel werk"</string>
591 590 <string name="phoneTypeWorkPager" msgid="649938731231157056">"Pager werk"</string>
592 591 <string name="phoneTypeAssistant" msgid="5596772636128562884">"Assistent"</string>
593   - <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string>
  592 + <string name="phoneTypeMms" msgid="7254492275502768992">"Mms"</string>
594 593 <string name="eventTypeCustom" msgid="7837586198458073404">"Aangepast"</string>
595 594 <string name="eventTypeBirthday" msgid="2813379844211390740">"Verjaardag"</string>
596 595 <string name="eventTypeAnniversary" msgid="3876779744518284000">"Jubileum"</string>
@@ -664,10 +663,10 @@
664 663 <string name="lockscreen_charged" msgid="4938930459620989972">"Opgeladen."</string>
665 664 <string name="lockscreen_battery_short" msgid="3617549178603354656">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
666 665 <string name="lockscreen_low_battery" msgid="1482873981919249740">"Sluit de oplader aan."</string>
667   - <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Geen SIM-kaart."</string>
668   - <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Geen SIM-kaart in tablet."</string>
669   - <string name="lockscreen_missing_sim_message" product="default" msgid="2186920585695169078">"Geen SIM-kaart in telefoon."</string>
670   - <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Plaats een SIM-kaart."</string>
  666 + <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Geen simkaart."</string>
  667 + <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Geen simkaart in tablet."</string>
  668 + <string name="lockscreen_missing_sim_message" product="default" msgid="2186920585695169078">"Geen simkaart in telefoon."</string>
  669 + <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Plaats een simkaart."</string>
671 670 <string name="lockscreen_missing_sim_instructions_long" msgid="7138450788301444298">"De simkaart ontbreekt of kan niet worden gelezen. Plaats een simkaart."</string>
672 671 <string name="lockscreen_permanent_disabled_sim_instructions" msgid="1631853574702335453">"Uw simkaart is permanent uitgeschakeld."\n" Neem contact op met uw draadloze serviceprovider voor een nieuwe simkaart."</string>
673 672 <string name="lockscreen_transport_prev_description" msgid="201594905152746886">"Knop voor vorig nummer"</string>
@@ -677,10 +676,10 @@
677 676 <string name="lockscreen_transport_stop_description" msgid="4562318378766987601">"Knop voor stoppen"</string>
678 677 <string name="emergency_calls_only" msgid="6733978304386365407">"Alleen noodoproepen"</string>
679 678 <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Netwerk vergrendeld"</string>
680   - <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM-kaart is vergrendeld met PUK-code."</string>
  679 + <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"Simkaart is vergrendeld met PUK-code."</string>
681 680 <string name="lockscreen_sim_puk_locked_instructions" msgid="635967534992394321">"Raadpleeg de gebruikershandleiding of neem contact op met de klantenservice."</string>
682   - <string name="lockscreen_sim_locked_message" msgid="8066660129206001039">"SIM-kaart is vergrendeld."</string>
683   - <string name="lockscreen_sim_unlock_progress_dialog_message" msgid="595323214052881264">"SIM-kaart ontgrendelen\u2026"</string>
  681 + <string name="lockscreen_sim_locked_message" msgid="8066660129206001039">"Simkaart is vergrendeld."</string>
  682 + <string name="lockscreen_sim_unlock_progress_dialog_message" msgid="595323214052881264">"Simkaart ontgrendelen\u2026"</string>
684 683 <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="3514742106066877476">"U heeft uw ontgrendelingspatroon <xliff:g id="NUMBER_0">%d</xliff:g> keer onjuist getekend. "\n\n"Probeer het over <xliff:g id="NUMBER_1">%d</xliff:g> seconden opnieuw."</string>
685 684 <string name="lockscreen_too_many_failed_password_attempts_dialog_message" msgid="4906034376425175381">"U heeft uw wachtwoord <xliff:g id="NUMBER_0">%d</xliff:g> keer onjuist ingevoerd. "\n\n"Probeer het over <xliff:g id="NUMBER_1">%d</xliff:g> seconden opnieuw."</string>
686 685 <string name="lockscreen_too_many_failed_pin_attempts_dialog_message" msgid="6827749231465145590">"U heeft uw PIN-code <xliff:g id="NUMBER_0">%d</xliff:g> keer onjuist ingevoerd. "\n\n"Probeer het over <xliff:g id="NUMBER_1">%d</xliff:g> seconden opnieuw."</string>
@@ -958,9 +957,7 @@
958 957 <item quantity="one" msgid="1634101450343277345">"Open Wi-Fi-netwerk beschikbaar"</item>
959 958 <item quantity="other" msgid="7915895323644292768">"Open Wi-Fi-netwerken beschikbaar"</item>
960 959 </plurals>
961   - <string name="wifi_available_sign_in" msgid="9157196203958866662">"Aanmelden bij wifi-netwerk"</string>
962   - <!-- no translation found for wifi_available_sign_in_detailed (6797764740339907572) -->
963   - <skip />
  960 + <string name="wifi_available_sign_in" msgid="9157196203958866662">"Aanmelden bij Wi-Fi-netwerk"</string>
964 961 <string name="wifi_watchdog_network_disabled" msgid="7904214231651546347">"Kan geen verbinding maken met Wi-Fi"</string>
965 962 <string name="wifi_watchdog_network_disabled_detailed" msgid="4917472096696322767">" heeft een slechte internetverbinding."</string>
966 963 <string name="wifi_p2p_dialog_title" msgid="97611782659324517">"Wi-Fi Direct"</string>
@@ -973,8 +970,8 @@
973 970 <string name="wifi_p2p_enabled_notification_message" msgid="1638949953993894335">"Aanraken voor instellingen"</string>
974 971 <string name="select_character" msgid="3365550120617701745">"Teken invoegen"</string>
975 972 <string name="sms_control_default_app_name" msgid="7630529934366549163">"Onbekende app"</string>
976   - <string name="sms_control_title" msgid="7296612781128917719">"SMS-berichten verzenden"</string>
977   - <string name="sms_control_message" msgid="1289331457999236205">"Er wordt een groot aantal SMS-berichten verzonden. Selecteer \'OK\' om door te gaan of \'Annuleren\' om de verzending te stoppen."</string>
  973 + <string name="sms_control_title" msgid="7296612781128917719">"Sms-berichten verzenden"</string>
  974 + <string name="sms_control_message" msgid="1289331457999236205">"Er wordt een groot aantal sms-berichten verzonden. Selecteer \'OK\' om door te gaan of \'Annuleren\' om de verzending te stoppen."</string>
978 975 <string name="sms_control_yes" msgid="2532062172402615953">"OK"</string>
979 976 <string name="sms_control_no" msgid="1715320703137199869">"Annuleren"</string>
980 977 <string name="sim_removed_title" msgid="6227712319223226185">"Simkaart verwijderd"</string>
@@ -1224,7 +1221,8 @@
1224 1221 <string name="launchBrowserDefault" msgid="2057951947297614725">"Browser starten?"</string>
1225 1222 <string name="SetupCallDefault" msgid="6870275517518479651">"Oproep accepteren?"</string>
1226 1223
1227   - <!-- CyanogenMod additions -->
  1224 + <!-- CYANOGENMOD EDITS -->
  1225 +
1228 1226 <string name="reboot_system" product="tablet">Tablet herstarten</string>
1229 1227 <string name="reboot_system" product="default">Telefoon herstarten</string>
1230 1228 <string name="global_action_screenshot">Beeldschermafdruk</string>
@@ -1233,4 +1231,88 @@
1233 1231 <string name="reboot_confirm">Uw telefoon zal worden herstart.</string>
1234 1232 <string name="global_action_reboot">Herstarten</string>
1235 1233 <string name="app_killed_message">App geforceerd afgesloten</string>
  1234 + <string name="roamingTextAirplaneMode">Vliegtuigmodus</string>
  1235 + <string name="global_action_choose_profile">Profiel</string>
  1236 + <string name="permlab_preventpower">Aan-/uitknop wijzigen</string>
  1237 + <string name="permdesc_preventpower">Staat een app toe het gedrag van de aan-/uitknop te wijzigen</string>
  1238 +
  1239 + <!-- Names of default profiles. -->
  1240 + <string name="profileNameDefault">Standaard</string>
  1241 + <string name="profileNameWork">Werk</string>
  1242 + <string name="profileNameHome">Thuis</string>
  1243 + <string name="profileNameSilent">Stil</string>
  1244 + <string name="profileNameNight">Nacht</string>
  1245 +
  1246 + <!-- Names of application groups. -->
  1247 + <string name="profileGroupPhone">Telefoon</string>
  1248 + <string name="profileGroupCalendar">Agenda</string>
  1249 + <string name="profileGroupGmail">Gmail</string>
  1250 + <string name="profileGroupEmail">E-mail</string>
  1251 + <string name="profileGroupSMS">Sms</string>
  1252 +
  1253 + <!-- Name of wildcard profile. -->
  1254 + <string name="wildcardProfile">Anders</string>
  1255 +
  1256 + <!-- Lock screen Weather - Weather codes -->
  1257 + <string name="weather_0">Tornado</string>
  1258 + <string name="weather_1">Tropische storm</string>
  1259 + <string name="weather_2">Tropische cycloon</string>
  1260 + <string name="weather_3">Zwaar onweer</string>
  1261 + <string name="weather_4">Onweer</string>
  1262 + <string name="weather_5">Regen en sneeuw</string>
  1263 + <string name="weather_6">Regen en natte sneeuw</string>
  1264 + <string name="weather_7">Sneeuw en natte sneeuw</string>
  1265 + <string name="weather_8">IJzel</string>
  1266 + <string name="weather_9">Motregen</string>
  1267 + <string name="weather_10">Aanvriezende regen</string>
  1268 + <string name="weather_11">Buien</string>
  1269 + <string name="weather_12">Buien</string>
  1270 + <string name="weather_13">Sneeuwjacht</string>
  1271 + <string name="weather_14">Lichte sneeuwbuien</string>
  1272 + <string name="weather_15">Sneeuwstorm</string>
  1273 + <string name="weather_16">Sneeuw</string>
  1274 + <string name="weather_17">Hagel</string>
  1275 + <string name="weather_18">Natte sneeuw</string>
  1276 + <string name="weather_19">Stof</string>
  1277 + <string name="weather_20">Mistig</string>
  1278 + <string name="weather_21">Heiig</string>
  1279 + <string name="weather_22">Walmend</string>
  1280 + <string name="weather_23">Stormachtig</string>
  1281 + <string name="weather_24">Waaierig</string>
  1282 + <string name="weather_25">Koud</string>
  1283 + <string name="weather_26">Bewolkt</string>
  1284 + <string name="weather_27">Overwegend bewolkt</string>
  1285 + <string name="weather_28">Overwegend bewolkt</string>
  1286 + <string name="weather_29">Deels bewolkt</string>
  1287 + <string name="weather_30">Deels bewolkt</string>
  1288 + <string name="weather_31">Helder</string>
  1289 + <string name="weather_32">Zonnig</string>
  1290 + <string name="weather_33">Mooi</string>
  1291 + <string name="weather_34">Mooi</string>
  1292 + <string name="weather_35">Regen en hagel</string>
  1293 + <string name="weather_36">Heet</string>
  1294 + <string name="weather_37">Geïsoleerde onweersbuien</string>
  1295 + <string name="weather_38">Verspreide onweersbuien</string>
  1296 + <string name="weather_39">Verspreide onweersbuien</string>
  1297 + <string name="weather_40">Verspreide buien</string>
  1298 + <string name="weather_41">Hevige sneeuwbuien</string>
  1299 + <string name="weather_42">Verspreide sneeuwbuien</string>
  1300 + <string name="weather_43">Hevige sneeuwbuien</string>
  1301 + <string name="weather_44">Deels bewolkt</string>
  1302 + <string name="weather_45">Onweersbuien</string>
  1303 + <string name="weather_46">Sneeuwstormen</string>
  1304 + <string name="weather_47">Geïsoleerde onweersbuien</string>
  1305 +
  1306 + <!-- Lock screen Weather - Wind directions -->
  1307 + <string name="weather_N">N</string>
  1308 + <string name="weather_NE">NO</string>
  1309 + <string name="weather_E">O</string>
  1310 + <string name="weather_SE">ZO</string>
  1311 + <string name="weather_S">Z</string>
  1312 + <string name="weather_SW">ZW</string>
  1313 + <string name="weather_W">W</string>
  1314 + <string name="weather_NW">NW</string>
  1315 +
  1316 + <!-- Lock screen Weather - error messages -->
  1317 + <string name="weather_tap_to_refresh">Vernieuwen</string>
1236 1318 </resources>
4 core/res/res/values/config.xml
@@ -828,4 +828,8 @@
828 828 config to 7. -->
829 829 <integer name="config_deviceHardwareKeys">15</integer>
830 830
  831 + <!-- Timeout in MS for how long you have to long-press the back key to
  832 + kill the foreground app. -->
  833 + <integer name="config_backKillTimeout">2000</integer>
  834 +
831 835 </resources>
39 media/libstagefright/MPEG4Writer.cpp
@@ -47,9 +47,6 @@ static const uint8_t kNalUnitTypeSeqParamSet = 0x07;
47 47 static const uint8_t kNalUnitTypePicParamSet = 0x08;
48 48 static const int64_t kInitialDelayTimeUs = 700000LL;
49 49
50   -// MPEG4 uses Jan 1, 1904 as epoch, not unix epoch
51   -static const int64_t kTimestampConversion = 2082844800LL;
52   -
53 50 class MPEG4Writer::Track {
54 51 public:
55 52 Track(MPEG4Writer *owner, const sp<MediaSource> &source, size_t trackId);
@@ -226,11 +223,11 @@ class MPEG4Writer::Track {
226 223 void writeDrefBox();
227 224 void writeDinfBox();
228 225 void writeDamrBox();
229   - void writeMdhdBox(int64_t now);
  226 + void writeMdhdBox(time_t now);
230 227 void writeSmhdBox();
231 228 void writeVmhdBox();
232 229 void writeHdlrBox();
233   - void writeTkhdBox(int64_t now);
  230 + void writeTkhdBox(time_t now);
234 231 void writeMp4aEsdsBox();
235 232 void writeMp4vEsdsBox();
236 233 void writeAudioFourCCBox();
@@ -714,14 +711,14 @@ status_t MPEG4Writer::stop() {
714 711 }
715 712
716 713 void MPEG4Writer::writeMvhdBox(int64_t durationUs) {
717   - int64_t now = time(NULL) + kTimestampConversion;
  714 + time_t now = time(NULL);
718 715 beginBox("mvhd");
719   - writeInt32(0x01000000); // version=1, flags=0
720   - writeInt64(now); // creation time
721   - writeInt64(now); // modification time
  716 + writeInt32(0); // version=0, flags=0
  717 + writeInt32(now); // creation time
  718 + writeInt32(now); // modification time
722 719 writeInt32(mTimeScale); // mvhd timescale
723 720 int32_t duration = (durationUs * mTimeScale + 5E5) / 1E6;
724   - writeInt64(duration);
  721 + writeInt32(duration);
725 722 writeInt32(0x10000); // rate: 1.0
726 723 writeInt16(0x100); // volume
727 724 writeInt16(0); // reserved
@@ -2329,7 +2326,7 @@ void MPEG4Writer::Track::writeTrackHeader(bool use32BitOffset) {
2329 2326 LOGV("%s track time scale: %d",
2330 2327 mIsAudio? "Audio": "Video", mTimeScale);
2331 2328
2332   - int64_t now = time(NULL) + kTimestampConversion;
  2329 + time_t now = time(NULL);
2333 2330 mOwner->beginBox("trak");
2334 2331 writeTkhdBox(now);
2335 2332 mOwner->beginBox("mdia");
@@ -2542,20 +2539,20 @@ void MPEG4Writer::Track::writeMp4vEsdsBox() {
2542 2539 mOwner->endBox(); // esds
2543 2540 }
2544 2541
2545   -void MPEG4Writer::Track::writeTkhdBox(int64_t now) {
  2542 +void MPEG4Writer::Track::writeTkhdBox(time_t now) {
2546 2543 mOwner->beginBox("tkhd");
2547 2544 // Flags = 7 to indicate that the track is enabled, and
2548 2545 // part of the presentation
2549   - mOwner->writeInt32(0x01000007); // version=1, flags=7
2550   - mOwner->writeInt64(now); // creation time
2551   - mOwner->writeInt64(now); // modification time
  2546 + mOwner->writeInt32(0x07); // version=0, flags=7
  2547 + mOwner->writeInt32(now); // creation time
  2548 + mOwner->writeInt32(now); // modification time
2552 2549 mOwner->writeInt32(mTrackId + 1); // track id starts with 1
2553 2550 mOwner->writeInt32(0); // reserved
2554 2551 int64_t trakDurationUs = getDurationUs();
2555 2552 int32_t mvhdTimeScale = mOwner->getTimeScale();
2556 2553 int32_t tkhdDuration =
2557 2554 (trakDurationUs * mvhdTimeScale + 5E5) / 1E6;
2558   - mOwner->writeInt64(tkhdDuration); // in mvhd timescale
  2555 + mOwner->writeInt32(tkhdDuration); // in mvhd timescale
2559 2556 mOwner->writeInt32(0); // reserved
2560 2557 mOwner->writeInt32(0); // reserved
2561 2558 mOwner->writeInt16(0); // layer
@@ -2611,15 +2608,15 @@ void MPEG4Writer::Track::writeHdlrBox() {
2611 2608 mOwner->endBox();
2612 2609 }
2613 2610
2614   -void MPEG4Writer::Track::writeMdhdBox(int64_t now) {
  2611 +void MPEG4Writer::Track::writeMdhdBox(time_t now) {
2615 2612 int64_t trakDurationUs = getDurationUs();
2616 2613 mOwner->beginBox("mdhd");
2617   - mOwner->writeInt32(0x01000000); // version=1, flags=0
2618   - mOwner->writeInt64(now); // creation time
2619   - mOwner->writeInt64(now); // modification time
  2614 + mOwner->writeInt32(0); // version=0, flags=0
  2615 + mOwner->writeInt32(now); // creation time
  2616 + mOwner->writeInt32(now); // modification time
2620 2617 mOwner->writeInt32(mTimeScale); // media timescale
2621 2618 int32_t mdhdDuration = (trakDurationUs * mTimeScale + 5E5) / 1E6;
2622   - mOwner->writeInt64(mdhdDuration); // use media timescale
  2619 + mOwner->writeInt32(mdhdDuration); // use media timescale
2623 2620 // Language follows the three letter standard ISO-639-2/T
2624 2621 // 'e', 'n', 'g' for "English", for instance.
2625 2622 // Each character is packed as the difference between its ASCII value and 0x60.
68 packages/SystemUI/res/values-nl/strings.xml
... ... @@ -1,28 +1,25 @@
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<!--
3   -/**
4   - * Copyright (c) 2009, The Android Open Source Project
5   - *
6   - * Licensed under the Apache License, Version 2.0 (the "License");
7   - * you may not use this file except in compliance with the License.
8   - * You may obtain a copy of the License at
9   - *
10   - * http://www.apache.org/licenses/LICENSE-2.0
11   - *
12   - * Unless required by applicable law or agreed to in writing, software
13   - * distributed under the License is distributed on an "AS IS" BASIS,
14   - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15   - * See the License for the specific language governing permissions and
16   - * limitations under the License.
17   - */
18   - -->
  2 +<!-- Copyright (C) 2009 The Android Open Source Project
  3 + Copyright (C) 2012 The CyanogenMod Project
19 4
  5 + Licensed under the Apache License, Version 2.0 (the "License");
  6 + you may not use this file except in compliance with the License.
  7 + You may obtain a copy of the License at
  8 +
  9 + http://www.apache.org/licenses/LICENSE-2.0
  10 +
  11 + Unless required by applicable law or agreed to in writing, software
  12 + distributed under the License is distributed on an "AS IS" BASIS,
  13 + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  14 + See the License for the specific language governing permissions and
  15 + limitations under the License.
  16 +-->
20 17 <resources xmlns:android="http://schemas.android.com/apk/res/android"
21 18 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
22 19 <string name="app_label" msgid="7164937344850004466">"Systeem-UI"</string>
23 20 <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Wissen"</string>
24 21 <string name="status_bar_do_not_disturb_button" msgid="5812628897510997853">"Niet storen"</string>
25   - <string name="status_bar_please_disturb_button" msgid="3345398298841572813">"Meldingen weergeven"</string>
  22 + <string name="status_bar_please_disturb_button" msgid="3345398298841572813">"Meldingen tonen"</string>
26 23 <string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Verwijderen uit lijst"</string>
27 24 <string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"App-info"</string>
28 25 <string name="status_bar_no_recent_apps" msgid="6576392951053994640">"Geen recente apps"</string>
@@ -41,7 +38,7 @@
41 38 <string name="battery_low_why" msgid="7279169609518386372">"Accugebruik"</string>
42 39 <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Instellingen"</string>
43 40 <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string>
44   - <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Vliegmodus"</string>
  41 + <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Vliegtuigmodus"</string>
45 42 <string name="status_bar_settings_auto_rotation" msgid="3790482541357798421">"Scherm automatisch draaien"</string>
46 43 <string name="status_bar_settings_mute_label" msgid="554682549917429396">"DEMPEN"</string>
47 44 <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string>
@@ -55,15 +52,15 @@
55 52 <string name="usb_accessory_confirm_prompt" msgid="3808984931830229888">"<xliff:g id="ACTIVITY">%1$s</xliff:g> openen wanneer dit USB-accessoire wordt aangesloten?"</string>
56 53 <string name="usb_accessory_uri_prompt" msgid="513450621413733343">"Er werken geen geïnstalleerde apps met dit USB-accessoire. Meer informatie op: <xliff:g id="URL">%1$s</xliff:g>"</string>
57 54 <string name="title_usb_accessory" msgid="4966265263465181372">"USB-accessoire"</string>
58   - <string name="label_view" msgid="6304565553218192990">"Weergeven"</string>
  55 + <string name="label_view" msgid="6304565553218192990">"Tonen"</string>
59 56 <string name="always_use_device" msgid="1450287437017315906">"Standaard gebruiken voor dit USB-apparaat"</string>
60 57 <string name="always_use_accessory" msgid="1210954576979621596">"Standaard gebruiken voor dit USB-accessoire"</string>
61 58 <string name="compat_mode_on" msgid="6623839244840638213">"Zoom om scherm te vullen"</string>
62 59 <string name="compat_mode_off" msgid="4434467572461327898">"Rek uit v. schermvulling"</string>
63 60 <string name="compat_mode_help_header" msgid="7969493989397529910">"Compatibiliteitszoom"</string>
64   - <string name="compat_mode_help_body" msgid="4946726776359270040">"Wanneer een app is ontworpen voor een kleiner scherm, wordt naast de klok een zoomknop weergegeven."</string>
65   - <string name="screenshot_saving_ticker" msgid="7403652894056693515">"Schermafbeelding opslaan..."</string>
66   - <string name="screenshot_saving_title" msgid="8242282144535555697">"Schermafbeelding opslaan..."</string>
  61 + <string name="compat_mode_help_body" msgid="4946726776359270040">"Wanneer een app is ontworpen voor een kleiner scherm, wordt naast de klok een zoomknop getoond."</string>
  62 + <string name="screenshot_saving_ticker" msgid="7403652894056693515">"Schermafbeelding opslaan\u2026"</string>
  63 + <string name="screenshot_saving_title" msgid="8242282144535555697">"Schermafbeelding opslaan\u2026"</string>
67 64 <string name="screenshot_saving_text" msgid="2419718443411738818">"Schermafbeelding wordt opgeslagen."</string>
68 65 <string name="screenshot_saved_title" msgid="6461865960961414961">"Schermafbeelding gemaakt."</string>
69 66 <string name="screenshot_saved_text" msgid="1152839647677558815">"Raak aan om uw schermafbeelding te bekijken."</string>
@@ -97,10 +94,10 @@
97 94 <string name="accessibility_data_two_bars" msgid="6166018492360432091">"Gegevens: twee streepjes."</string>
98 95 <string name="accessibility_data_three_bars" msgid="9167670452395038520">"Gegevens: drie streepjes."</string>
99 96 <string name="accessibility_data_signal_full" msgid="2708384608124519369">"Gegevenssignaal is op volle sterkte."</string>
100   - <string name="accessibility_no_wifi" msgid="7455607460517331976">"Geen wifi."</string>
101   - <string name="accessibility_wifi_one_bar" msgid="6854947280074467207">"Wifi: één streepje."</string>
102   - <string name="accessibility_wifi_two_bars" msgid="3344340012058984348">"Wifi: twee streepjes."</string>
103   - <string name="accessibility_wifi_three_bars" msgid="928322805193265041">"Wifi: drie streepjes."</string>
  97 + <string name="accessibility_no_wifi" msgid="7455607460517331976">"Geen Wi-Fi."</string>
  98 + <string name="accessibility_wifi_one_bar" msgid="6854947280074467207">"Wi-Fi: één streepje."</string>
  99 + <string name="accessibility_wifi_two_bars" msgid="3344340012058984348">"Wi-Fi: twee streepjes."</string>
  100 + <string name="accessibility_wifi_three_bars" msgid="928322805193265041">"Wi-Fi: drie streepjes."</string>
104 101 <string name="accessibility_wifi_signal_full" msgid="1275764416228473932">"Wi-Fi-signaal is op volledige sterkte."</string>
105 102 <string name="accessibility_no_wimax" msgid="4329180129727630368">"Geen WiMAX."</string>
106 103 <string name="accessibility_wimax_one_bar" msgid="4170994299011863648">"WiMAX: één streepje."</string>
@@ -113,10 +110,10 @@
113 110 <string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
114 111 <string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
115 112 <string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
116   - <string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wifi"</string>
  113 + <string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
117 114 <string name="accessibility_no_sim" msgid="8274017118472455155">"Geen simkaart."</string>
118 115 <string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth-tethering."</string>
119   - <string name="accessibility_airplane_mode" msgid="834748999790763092">"Vliegmodus."</string>
  116 + <string name="accessibility_airplane_mode" msgid="834748999790763092">"Vliegtuigmodus."</string>
120 117 <string name="accessibility_battery_level" msgid="7451474187113371965">"Accu: <xliff:g id="NUMBER">%d</xliff:g> procent."</string>
121 118 <string name="accessibility_settings_button" msgid="799583911231893380">"Systeeminstellingen."</string>
122 119 <string name="accessibility_notifications_button" msgid="4498000369779421892">"Meldingen."</string>
@@ -138,4 +135,17 @@
138 135 <string name="gps_notification_searching_text" msgid="8574247005642736060">"Zoeken naar GPS"</string>
139 136 <string name="gps_notification_found_text" msgid="4619274244146446464">"Locatie bepaald met GPS"</string>
140 137 <string name="accessibility_clear_all" msgid="5235938559247164925">"Alle meldingen wissen."</string>
  138 +
  139 + <!-- CYANOGENMOD EDITS -->
  140 +
  141 + <!-- Dialog title for navigation bar button selection -->
  142 + <string name="navbar_dialog_title">Kies de toe te wijzen functie</string>
  143 + <string name="navbar_home_button">Thuisknop</string>
  144 + <string name="navbar_recent_button">Recentknop</string>
  145 + <string name="navbar_search_button">Zoekknop</string>
  146 + <string name="navbar_back_button">Terugknop</string>
  147 + <string name="navbar_empty_button">Functieloze knop</string>
  148 + <string name="navbar_menu_conditional_button">Menuknop (altijd verbergen)</string>
  149 + <string name="navbar_menu_always_button">Menuknop (altijd tonen)</string>
  150 + <string name="navbar_menu_big_button">Menuknop</string>
141 151 </resources>
5 policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -367,6 +367,7 @@
367 367 static final int DEFAULT_ACCELEROMETER_ROTATION = 0;
368 368 int mAccelerometerDefault = DEFAULT_ACCELEROMETER_ROTATION;
369 369 boolean mHasSoftInput = false;
  370 + int mBackKillTimeout;
370 371
371 372 int mPointerLocationMode = 0;
372 373 PointerLocationView mPointerLocationView = null;
@@ -993,6 +994,8 @@ public void init(Context context, IWindowManager windowManager,
993 994 com.android.internal.R.integer.config_lidKeyboardAccessibility);
994 995 mLidNavigationAccessibility = mContext.getResources().getInteger(
995 996 com.android.internal.R.integer.config_lidNavigationAccessibility);
  997 + mBackKillTimeout = mContext.getResources().getInteger(
  998 + com.android.internal.R.integer.config_backKillTimeout);
996 999 // register for dock events
997 1000 IntentFilter filter = new IntentFilter();
998 1001 filter.addAction(UiModeManager.ACTION_ENTER_CAR_MODE);
@@ -1894,7 +1897,7 @@ public long interceptKeyBeforeDispatching(WindowState win, KeyEvent event, int p
1894 1897 if (Settings.Secure.getInt(mContext.getContentResolver(),
1895 1898 Settings.Secure.KILL_APP_LONGPRESS_BACK, 0) == 1) {
1896 1899 if (down && repeatCount == 0) {
1897   - mHandler.postDelayed(mBackLongPress, 2000);
  1900 + mHandler.postDelayed(mBackLongPress, mBackKillTimeout);
1898 1901 }
1899 1902 }
1900 1903 }
1,297 telephony/java/com/android/internal/telephony/Smdk4210RIL.java
... ... @@ -1,649 +1,648 @@
1   -/*
2   - * Copyright (C) 2011 The CyanogenMod Project
3   - *
4   - * Licensed under the Apache License, Version 2.0 (the "License");
5   - * you may not use this file except in compliance with the License.
6   - * You may obtain a copy of the License at
7   - *
8   - * http://www.apache.org/licenses/LICENSE-2.0
9   - *
10   - * Unless required by applicable law or agreed to in writing, software
11   - * distributed under the License is distributed on an "AS IS" BASIS,
12   - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13   - * See the License for the specific language governing permissions and
14   - * limitations under the License.
15   - */
16   -
17   -package com.android.internal.telephony;
18   -
19   -import static com.android.internal.telephony.RILConstants.*;
20   -import static android.telephony.TelephonyManager.NETWORK_TYPE_UNKNOWN;
21   -import static android.telephony.TelephonyManager.NETWORK_TYPE_EDGE;
22   -import static android.telephony.TelephonyManager.NETWORK_TYPE_GPRS;
23   -import static android.telephony.TelephonyManager.NETWORK_TYPE_UMTS;
24   -import static android.telephony.TelephonyManager.NETWORK_TYPE_HSDPA;
25   -import static android.telephony.TelephonyManager.NETWORK_TYPE_HSUPA;
26   -import static android.telephony.TelephonyManager.NETWORK_TYPE_HSPA;
27   -
28   -import android.content.BroadcastReceiver;
29   -import android.content.Context;
30   -import android.content.Intent;
31   -import android.content.IntentFilter;
32   -import android.content.res.Resources;
33   -import android.net.ConnectivityManager;
34   -import android.net.LocalSocket;
35   -import android.net.LocalSocketAddress;
36   -import android.net.NetworkInfo;
37   -import android.os.AsyncResult;
38   -import android.os.Handler;
39   -import android.os.HandlerThread;
40   -import android.os.Looper;
41   -import android.os.Message;
42   -import android.os.Parcel;
43   -import android.os.PowerManager;
44   -import android.os.SystemProperties;
45   -import android.os.PowerManager.WakeLock;
46   -import android.telephony.NeighboringCellInfo;
47   -import android.telephony.PhoneNumberUtils;
48   -import android.telephony.SmsManager;
49   -import android.telephony.SmsMessage;
50   -import android.text.TextUtils;
51   -import android.util.Log;
52   -
53   -import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo;
54   -import com.android.internal.telephony.gsm.SuppServiceNotification;
55   -import com.android.internal.telephony.cdma.CdmaCallWaitingNotification;
56   -import com.android.internal.telephony.cdma.CdmaInformationRecords;
57   -
58   -import java.io.ByteArrayInputStream;
59   -import java.io.DataInputStream;
60   -import java.io.IOException;
61   -import java.io.InputStream;
62   -import java.util.ArrayList;
63   -import java.util.Collections;
64   -
65   -public class Smdk4210RIL extends RIL implements CommandsInterface {
66   -
67   - //SAMSUNG SMDK4210 STATES
68   - static final int RIL_REQUEST_DIAL_EMERGENCY = 10016;
69   - static final int RIL_UNSOL_STK_SEND_SMS_RESULT = 11002;
70   - static final int RIL_UNSOL_O2_HOME_ZONE_INFO = 11007;
71   - static final int RIL_UNSOL_DEVICE_READY_NOTI = 11008;
72   - static final int RIL_UNSOL_SAMSUNG_UNKNOWN_MAGIC_REQUEST_1 = 11010;
73   - static final int RIL_UNSOL_SAMSUNG_UNKNOWN_MAGIC_REQUEST_2 = 11011;
74   - static final int RIL_UNSOL_SAMSUNG_UNKNOWN_MAGIC_REQUEST_3 = 11012;
75   - static final int RIL_UNSOL_HSDPA_STATE_CHANGED = 11016;
76   - protected HandlerThread mSmdk4210Thread;
77   - protected ConnectivityHandler mSmdk4210Handler;
78   -
79   - public Smdk4210RIL(Context context, int networkMode, int cdmaSubscription) {
80   - super(context, networkMode, cdmaSubscription);
81   - }
82   -
83   - @Override
84   - public void setCurrentPreferredNetworkType() {
85   - if (RILJ_LOGD) riljLog("setCurrentPreferredNetworkType IGNORED");
86   - /* Google added this as a fix for crespo loosing network type after
87   - * taking an OTA. This messes up the data connection state for us
88   - * due to the way we handle network type change (disable data
89   - * then change then re-enable).
90   - */
91   - }
92   -
93   - private boolean NeedReconnect()
94   - {
95   - ConnectivityManager cm =
96   - (ConnectivityManager)mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
97   - NetworkInfo ni_active = cm.getActiveNetworkInfo();
98   -
99   - return ni_active != null && ni_active.getTypeName().equalsIgnoreCase( "mobile" ) &&
100   - ni_active.isConnected() && cm.getMobileDataEnabled();
101   - }
102   -
103   - @Override
104   - public void setPreferredNetworkType(int networkType , Message response) {
105   - /* Samsung modem implementation does bad things when a datacall is running
106   - * while switching the preferred networktype.
107   - */
108   - HandlerThread handlerThread;
109   - Looper looper;
110   -
111   - if(NeedReconnect())
112   - {
113   - if (mSmdk4210Handler == null) {
114   -
115   - handlerThread = new HandlerThread("mSmdk4210Thread");
116   - mSmdk4210Thread = handlerThread;
117   -
118   - mSmdk4210Thread.start();
119   -
120   - looper = mSmdk4210Thread.getLooper();
121   - mSmdk4210Handler = new ConnectivityHandler(mContext, looper);
122   - }
123   - mSmdk4210Handler.setPreferedNetworkType(networkType, response);
124   - } else {
125   - if (mSmdk4210Handler != null) {
126   - mSmdk4210Thread = null;
127   - mSmdk4210Handler = null;
128   - }
129   - sendPreferedNetworktype(networkType, response);
130   - }
131   -
132   - }
133   -
134   - //Sends the real RIL request to the modem.
135   - private void sendPreferedNetworktype(int networkType, Message response) {
136   - RILRequest rr = RILRequest.obtain(
137   - RILConstants.RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, response);
138   -
139   - rr.mp.writeInt(1);
140   - rr.mp.writeInt(networkType);
141   -
142   - if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
143   - + " : " + networkType);
144   -
145   - send(rr);
146   - }
147   -
148   - /* private class that does the handling for the dataconnection
149   - * dataconnection is done async, so we send the request for disabling it,
150   - * wait for the response, set the prefered networktype and notify the
151   - * real sender with its result.
152   - */
153   - private class ConnectivityHandler extends Handler{
154   -
155   - private static final int MESSAGE_SET_PREFERRED_NETWORK_TYPE = 30;
156   - private Context mContext;
157   - private int mDesiredNetworkType;
158   - //the original message, we need it for calling back the original caller when done
159   - private Message mNetworktypeResponse;
160   - private ConnectivityBroadcastReceiver mConnectivityReceiver = new ConnectivityBroadcastReceiver();
161   -
162   - public ConnectivityHandler(Context context, Looper looper)
163   - {
164   - super (looper);
165   - mContext = context;
166   - }
167   -
168   - private void startListening() {
169   - IntentFilter filter = new IntentFilter();
170   - filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
171   - mContext.registerReceiver(mConnectivityReceiver, filter);
172   - }
173   -
174   - private synchronized void stopListening() {
175   - mContext.unregisterReceiver(mConnectivityReceiver);
176   - }
177   -
178   - public void setPreferedNetworkType(int networkType, Message response)
179   - {
180   - Log.d(LOG_TAG, "Mobile Dataconnection is online setting it down");
181   - mDesiredNetworkType = networkType;
182   - mNetworktypeResponse = response;
183   - ConnectivityManager cm =
184   - (ConnectivityManager)mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
185   - //start listening for the connectivity change broadcast
186   - startListening();
187   - cm.setMobileDataEnabled(false);
188   - }
189   -
190   - @Override
191   - public void handleMessage(Message msg) {
192   - switch(msg.what) {
193   - //networktype was set, now we can enable the dataconnection again
194   - case MESSAGE_SET_PREFERRED_NETWORK_TYPE:
195   - ConnectivityManager cm =
196   - (ConnectivityManager)mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
197   -
198   - Log.d(LOG_TAG, "preferred NetworkType set upping Mobile Dataconnection");
199   - cm.setMobileDataEnabled(true);
200   - //everything done now call back that we have set the networktype
201   - AsyncResult.forMessage(mNetworktypeResponse, null, null);
202   - mNetworktypeResponse.sendToTarget();
203   - mNetworktypeResponse = null;
204   - break;
205   - default:
206   - throw new RuntimeException("unexpected event not handled");
207   - }
208   - }
209   -
210   - private class ConnectivityBroadcastReceiver extends BroadcastReceiver {
211   -
212   - @Override
213   - public void onReceive(Context context, Intent intent) {
214   - String action = intent.getAction();
215   - if (!action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
216   - Log.w(LOG_TAG, "onReceived() called with " + intent);
217   - return;
218   - }
219   - boolean noConnectivity =
220   - intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false);
221   -
222   - if (noConnectivity) {
223   - //Ok dataconnection is down, now set the networktype
224   - Log.w(LOG_TAG, "Mobile Dataconnection is now down setting preferred NetworkType");
225   - stopListening();
226   - sendPreferedNetworktype(mDesiredNetworkType, obtainMessage(MESSAGE_SET_PREFERRED_NETWORK_TYPE));
227   - mDesiredNetworkType = -1;
228   - }
229   - }
230   - }
231   - }
232   -
233   - @Override
234   - protected void processSolicited (Parcel p) {
235   - int serial, error;
236   - boolean found = false;
237   -
238   - serial = p.readInt();
239   - error = p.readInt();
240   -
241   - RILRequest rr;
242   -
243   - rr = findAndRemoveRequestFromList(serial);
244   -
245   - if (rr == null) {
246   - Log.w(LOG_TAG, "Unexpected solicited response! sn: "
247   - + serial + " error: " + error);
248   - return;
249   - }
250   -
251   - Object ret = null;
252   -
253   - if (error == 0 || p.dataAvail() > 0) {
254   - // either command succeeds or command fails but with data payload
255   - try {switch (rr.mRequest) {
256   -
257   - case RIL_REQUEST_GET_SIM_STATUS: ret = responseIccCardStatus(p); break;
258   - case RIL_REQUEST_ENTER_SIM_PIN: ret = responseInts(p); break;
259   - case RIL_REQUEST_ENTER_SIM_PUK: ret = responseInts(p); break;
260   - case RIL_REQUEST_ENTER_SIM_PIN2: ret = responseInts(p); break;
261   - case RIL_REQUEST_ENTER_SIM_PUK2: ret = responseInts(p); break;
262   - case RIL_REQUEST_CHANGE_SIM_PIN: ret = responseInts(p); break;
263   - case RIL_REQUEST_CHANGE_SIM_PIN2: ret = responseInts(p); break;
264   - case RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION: ret = responseInts(p); break;
265   - case RIL_REQUEST_GET_CURRENT_CALLS: ret = responseCallList(p); break;
266   - case RIL_REQUEST_DIAL: ret = responseVoid(p); break;
267   - case RIL_REQUEST_GET_IMSI: ret = responseString(p); break;
268   - case RIL_REQUEST_HANGUP: ret = responseVoid(p); break;
269   - case RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND: ret = responseVoid(p); break;
270   - case RIL_REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND: ret = responseVoid(p); break;
271   - case RIL_REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE: ret = responseVoid(p); break;
272   - case RIL_REQUEST_CONFERENCE: ret = responseVoid(p); break;
273   - case RIL_REQUEST_UDUB: ret = responseVoid(p); break;
274   - case RIL_REQUEST_LAST_CALL_FAIL_CAUSE: ret = responseInts(p); break;
275   - case RIL_REQUEST_SIGNAL_STRENGTH: ret = responseSignalStrength(p); break;
276   - case RIL_REQUEST_VOICE_REGISTRATION_STATE: ret = responseStrings(p); break;
277   - case RIL_REQUEST_DATA_REGISTRATION_STATE: ret = responseStrings(p); break;
278   - case RIL_REQUEST_OPERATOR: ret = responseStrings(p); break;
279   - case RIL_REQUEST_RADIO_POWER: ret = responseVoid(p); break;
280   - case RIL_REQUEST_DTMF: ret = responseVoid(p); break;
281   - case RIL_REQUEST_SEND_SMS: ret = responseSMS(p); break;
282   - case RIL_REQUEST_SEND_SMS_EXPECT_MORE: ret = responseSMS(p); break;
283   - case RIL_REQUEST_SETUP_DATA_CALL: ret = responseSetupDataCall(p); break;
284   - case RIL_REQUEST_SIM_IO: ret = responseICC_IO(p); break;
285   - case RIL_REQUEST_SEND_USSD: ret = responseVoid(p); break;
286   - case RIL_REQUEST_CANCEL_USSD: ret = responseVoid(p); break;
287   - case RIL_REQUEST_GET_CLIR: ret = responseInts(p); break;
288   - case RIL_REQUEST_SET_CLIR: ret = responseVoid(p); break;
289   - case RIL_REQUEST_QUERY_CALL_FORWARD_STATUS: ret = responseCallForward(p); break;
290   - case RIL_REQUEST_SET_CALL_FORWARD: ret = responseVoid(p); break;
291   - case RIL_REQUEST_QUERY_CALL_WAITING: ret = responseInts(p); break;
292   - case RIL_REQUEST_SET_CALL_WAITING: ret = responseVoid(p); break;
293   - case RIL_REQUEST_SMS_ACKNOWLEDGE: ret = responseVoid(p); break;
294   - case RIL_REQUEST_GET_IMEI: ret = responseString(p); break;
295   - case RIL_REQUEST_GET_IMEISV: ret = responseString(p); break;
296   - case RIL_REQUEST_ANSWER: ret = responseVoid(p); break;
297   - case RIL_REQUEST_DEACTIVATE_DATA_CALL: ret = responseVoid(p); break;
298   - case RIL_REQUEST_QUERY_FACILITY_LOCK: ret = responseInts(p); break;
299   - case RIL_REQUEST_SET_FACILITY_LOCK: ret = responseInts(p); break;
300   - case RIL_REQUEST_CHANGE_BARRING_PASSWORD: ret = responseVoid(p); break;
301   - case RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE: ret = responseInts(p); break;
302   - case RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC: ret = responseVoid(p); break;
303   - case RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL: ret = responseVoid(p); break;
304   - case RIL_REQUEST_QUERY_AVAILABLE_NETWORKS : ret = responseOperatorInfos(p); break;
305   - case RIL_REQUEST_DTMF_START: ret = responseVoid(p); break;
306   - case RIL_REQUEST_DTMF_STOP: ret = responseVoid(p); break;
307   - case RIL_REQUEST_BASEBAND_VERSION: ret = responseString(p); break;
308   - case RIL_REQUEST_SEPARATE_CONNECTION: ret = responseVoid(p); break;
309   - case RIL_REQUEST_SET_MUTE: ret = responseVoid(p); break;
310   - case RIL_REQUEST_GET_MUTE: ret = responseInts(p); break;
311   - case RIL_REQUEST_QUERY_CLIP: ret = responseInts(p); break;
312   - case RIL_REQUEST_LAST_DATA_CALL_FAIL_CAUSE: ret = responseInts(p); break;
313   - case RIL_REQUEST_DATA_CALL_LIST: ret = responseDataCallList(p); break;
314   - case RIL_REQUEST_RESET_RADIO: ret = responseVoid(p); break;
315   - case RIL_REQUEST_OEM_HOOK_RAW: ret = responseRaw(p); break;
316   - case RIL_REQUEST_OEM_HOOK_STRINGS: ret = responseStrings(p); break;
317   - case RIL_REQUEST_SCREEN_STATE: ret = responseVoid(p); break;
318   - case RIL_REQUEST_SET_SUPP_SVC_NOTIFICATION: ret = responseVoid(p); break;
319   - case RIL_REQUEST_WRITE_SMS_TO_SIM: ret = responseInts(p); break;
320   - case RIL_REQUEST_DELETE_SMS_ON_SIM: ret = responseVoid(p); break;
321   - case RIL_REQUEST_SET_BAND_MODE: ret = responseVoid(p); break;
322   - case RIL_REQUEST_QUERY_AVAILABLE_BAND_MODE: ret = responseInts(p); break;
323   - case RIL_REQUEST_STK_GET_PROFILE: ret = responseString(p); break;
324   - case RIL_REQUEST_STK_SET_PROFILE: ret = responseVoid(p); break;
325   - case RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND: ret = responseString(p); break;
326   - case RIL_REQUEST_STK_SEND_TERMINAL_RESPONSE: ret = responseVoid(p); break;
327   - case RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM: ret = responseInts(p); break;
328   - case RIL_REQUEST_EXPLICIT_CALL_TRANSFER: ret = responseVoid(p); break;
329   - case RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE: ret = responseVoid(p); break;
330   - case RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE: ret = responseGetPreferredNetworkType(p); break;
331   - case RIL_REQUEST_GET_NEIGHBORING_CELL_IDS: ret = responseVoid(p); break;
332   - case RIL_REQUEST_SET_LOCATION_UPDATES: ret = responseVoid(p); break;
333   - case RIL_REQUEST_CDMA_SET_SUBSCRIPTION_SOURCE: ret = responseVoid(p); break;
334   - case RIL_REQUEST_CDMA_SET_ROAMING_PREFERENCE: ret = responseVoid(p); break;
335   - case RIL_REQUEST_CDMA_QUERY_ROAMING_PREFERENCE: ret = responseInts(p); break;
336   - case RIL_REQUEST_SET_TTY_MODE: ret = responseVoid(p); break;
337   - case RIL_REQUEST_QUERY_TTY_MODE: ret = responseInts(p); break;
338   - case RIL_REQUEST_CDMA_SET_PREFERRED_VOICE_PRIVACY_MODE: ret = responseVoid(p); break;
339   - case RIL_REQUEST_CDMA_QUERY_PREFERRED_VOICE_PRIVACY_MODE: ret = responseInts(p); break;
340   - case RIL_REQUEST_CDMA_FLASH: ret = responseVoid(p); break;
341   - case RIL_REQUEST_CDMA_BURST_DTMF: ret = responseVoid(p); break;
342   - case RIL_REQUEST_CDMA_SEND_SMS: ret = responseSMS(p); break;
343   - case RIL_REQUEST_CDMA_SMS_ACKNOWLEDGE: ret = responseVoid(p); break;
344   - case RIL_REQUEST_GSM_GET_BROADCAST_CONFIG: ret = responseGmsBroadcastConfig(p); break;
345   - case RIL_REQUEST_GSM_SET_BROADCAST_CONFIG: ret = responseVoid(p); break;
346   - case RIL_REQUEST_GSM_BROADCAST_ACTIVATION: ret = responseVoid(p); break;
347   - case RIL_REQUEST_CDMA_GET_BROADCAST_CONFIG: ret = responseCdmaBroadcastConfig(p); break;
348   - case RIL_REQUEST_CDMA_SET_BROADCAST_CONFIG: ret = responseVoid(p); break;
349   - case RIL_REQUEST_CDMA_BROADCAST_ACTIVATION: ret = responseVoid(p); break;
350   - case RIL_REQUEST_CDMA_VALIDATE_AND_WRITE_AKEY: ret = responseVoid(p); break;
351   - case RIL_REQUEST_CDMA_SUBSCRIPTION: ret = responseStrings(p); break;
352   - case RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM: ret = responseInts(p); break;
353   - case RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM: ret = responseVoid(p); break;
354   - case RIL_REQUEST_DEVICE_IDENTITY: ret = responseStrings(p); break;
355   - case RIL_REQUEST_GET_SMSC_ADDRESS: ret = responseString(p); break;
356   - case RIL_REQUEST_SET_SMSC_ADDRESS: ret = responseVoid(p); break;
357   - case RIL_REQUEST_EXIT_EMERGENCY_CALLBACK_MODE: ret = responseVoid(p); break;
358   - case RIL_REQUEST_REPORT_SMS_MEMORY_STATUS: ret = responseVoid(p); break;
359   - case RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING: ret = responseVoid(p); break;
360   - case RIL_REQUEST_CDMA_GET_SUBSCRIPTION_SOURCE: ret = responseInts(p); break;
361   - case RIL_REQUEST_ISIM_AUTHENTICATION: ret = responseString(p); break;
362   - default:
363   - throw new RuntimeException("Unrecognized solicited response: " + rr.mRequest);
364   - //break;
365   - }} catch (Throwable tr) {
366   - // Exceptions here usually mean invalid RIL responses
367   -
368   - Log.w(LOG_TAG, rr.serialString() + "< "
369   - + requestToString(rr.mRequest)
370   - + " exception, possible invalid RIL response", tr);
371   -
372   - if (rr.mResult != null) {
373   - AsyncResult.forMessage(rr.mResult, null, tr);
374   - rr.mResult.sendToTarget();
375   - }
376   - rr.release();
377   - return;
378   - }
379   - }
380   -
381   - if (error != 0) {
382   - //ugly fix for Samsung messing up SMS_SEND request fail in binary RIL
383   - if(!(error == -1 && rr.mRequest == RIL_REQUEST_SEND_SMS))
384   - {
385   - rr.onError(error, ret);
386   - rr.release();
387   - return;
388   - } else {
389   - try
390   - {
391   - ret = responseSMS(p);
392   - } catch (Throwable tr) {
393   - Log.w(LOG_TAG, rr.serialString() + "< "
394   - + requestToString(rr.mRequest)
395   - + " exception, Processing Samsung SMS fix ", tr);
396   - rr.onError(error, ret);
397   - rr.release();
398   - return;
399   - }
400   - }
401   - }
402   -
403   - if (RILJ_LOGD) riljLog(rr.serialString() + "< " + requestToString(rr.mRequest)
404   - + " " + retToString(rr.mRequest, ret));
405   -
406   - if (rr.mResult != null) {
407   - AsyncResult.forMessage(rr.mResult, ret, null);
408   - rr.mResult.sendToTarget();
409   - }
410   -
411   - rr.release();
412   - }
413   -
414   - @Override
415   - protected void
416   - processUnsolicited (Parcel p) {
417   - Object ret;
418   - int dataPosition = p.dataPosition();
419   - int response = p.readInt();
420   -
421   - switch (response) {
422   - case RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS: ret = responseString(p); break;
423   - case RIL_UNSOL_RIL_CONNECTED: ret = responseInts(p); break;
424   - // SAMSUNG STATES
425   - case RIL_UNSOL_SAMSUNG_UNKNOWN_MAGIC_REQUEST_1: ret = responseVoid(p); break;
426   - case RIL_UNSOL_SAMSUNG_UNKNOWN_MAGIC_REQUEST_2: ret = responseVoid(p); break;
427   - case RIL_UNSOL_SAMSUNG_UNKNOWN_MAGIC_REQUEST_3: ret = responseVoid(p); break;
428   -
429   - default:
430   - // Rewind the Parcel
431   - p.setDataPosition(dataPosition);
432   -
433   - // Forward responses that we are not overriding to the super class
434   - super.processUnsolicited(p);
435   - return;
436   - }
437   -
438   - switch (response) {
439   - case RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS:
440   - if (RILJ_LOGD) unsljLogRet(response, ret);
441   -
442   - if (mGsmBroadcastSmsRegistrant != null) {
443   - mGsmBroadcastSmsRegistrant
444   - .notifyRegistrant(new AsyncResult(null, ret, null));
445   - }
446   - break;
447   - case RIL_UNSOL_RIL_CONNECTED:
448   - if (RILJ_LOGD) unsljLogRet(response, ret);
449   -
450   - // Initial conditions
451   - setRadioPower(false, null);
452   - sendPreferedNetworktype(mPreferredNetworkType, null);
453   - setCdmaSubscriptionSource(mCdmaSubscription, null);
454   - notifyRegistrantsRilConnectionChanged(((int[])ret)[0]);
455   - break;
456   - // SAMSUNG STATES
457   - case RIL_UNSOL_SAMSUNG_UNKNOWN_MAGIC_REQUEST_1:
458   - case RIL_UNSOL_SAMSUNG_UNKNOWN_MAGIC_REQUEST_2:
459   - case RIL_UNSOL_SAMSUNG_UNKNOWN_MAGIC_REQUEST_3:
460   - break;
461   - }
462   - }
463   -
464   - /**
465   - * Notifiy all registrants that the ril has connected or disconnected.
466   - *
467   - * @param rilVer is the version of the ril or -1 if disconnected.
468   - */
469   - private void notifyRegistrantsRilConnectionChanged(int rilVer) {
470   - mRilVersion = rilVer;
471   - if (mRilConnectedRegistrants != null) {
472   - mRilConnectedRegistrants.notifyRegistrants(
473   - new AsyncResult (null, new Integer(rilVer), null));
474   - }
475   - }
476   -
477   - @Override
478   - protected Object
479   - responseCallList(Parcel p) {
480   - int num;
481   - int voiceSettings;
482   - ArrayList<DriverCall> response;
483   - DriverCall dc;
484   - int dataAvail = p.dataAvail();
485   - int pos = p.dataPosition();
486   - int size = p.dataSize();
487   -
488   - Log.d(LOG_TAG, "Parcel size = " + size);
489   - Log.d(LOG_TAG, "Parcel pos = " + pos);
490   - Log.d(LOG_TAG, "Parcel dataAvail = " + dataAvail);
491   -
492   - //Samsung changes
493   - num = p.readInt();
494   -
495   - Log.d(LOG_TAG, "num = " + num);
496   - response = new ArrayList<DriverCall>(num);
497   -
498   - for (int i = 0 ; i < num ; i++) {
499   -
500   - dc = new DriverCall();
501   -
502   - dc.state = DriverCall.stateFromCLCC(p.readInt());
503   - Log.d(LOG_TAG, "state = " + dc.state);
504   - dc.index = p.readInt();
505   - Log.d(LOG_TAG, "index = " + dc.index);
506   - dc.TOA = p.readInt();
507   - Log.d(LOG_TAG, "state = " + dc.TOA);
508   - dc.isMpty = (0 != p.readInt());
509   - Log.d(LOG_TAG, "isMpty = " + dc.isMpty);
510   - dc.isMT = (0 != p.readInt());
511   - Log.d(LOG_TAG, "isMT = " + dc.isMT);
512   - dc.als = p.readInt();
513   - Log.d(LOG_TAG, "als = " + dc.als);
514   - voiceSettings = p.readInt();
515   - dc.isVoice = (0 == voiceSettings) ? false : true;
516   - Log.d(LOG_TAG, "isVoice = " + dc.isVoice);
517   - dc.isVoicePrivacy = (0 != p.readInt());
518   - //Some Samsung magic data for Videocalls
519   - voiceSettings = p.readInt();
520   - //printing it to cosole for later investigation
521   - Log.d(LOG_TAG, "Samsung magic = " + voiceSettings);
522   - dc.number = p.readString();
523   - Log.d(LOG_TAG, "number = " + dc.number);
524   - int np = p.readInt();
525   - Log.d(LOG_TAG, "np = " + np);
526   - dc.numberPresentation = DriverCall.presentationFromCLIP(np);
527   - dc.name = p.readString();
528   - Log.d(LOG_TAG, "name = " + dc.name);
529   - dc.namePresentation = p.readInt();
530   - Log.d(LOG_TAG, "namePresentation = " + dc.namePresentation);
531   - int uusInfoPresent = p.readInt();
532   - Log.d(LOG_TAG, "uusInfoPresent = " + uusInfoPresent);
533   -
534   - if (uusInfoPresent == 1) {
535   - dc.uusInfo = new UUSInfo();
536   - dc.uusInfo.setType(p.readInt());
537   - dc.uusInfo.setDcs(p.readInt());
538   - byte[] userData = p.createByteArray();
539   - dc.uusInfo.setUserData(userData);
540   - Log
541   - .v(LOG_TAG, String.format("Incoming UUS : type=%d, dcs=%d, length=%d",
542   - dc.uusInfo.getType(), dc.uusInfo.getDcs(),
543   - dc.uusInfo.getUserData().length));
544   - Log.v(LOG_TAG, "Incoming UUS : data (string)="
545   - + new String(dc.uusInfo.getUserData()));
546   - Log.v(LOG_TAG, "Incoming UUS : data (hex): "
547   - + IccUtils.bytesToHexString(dc.uusInfo.getUserData()));
548   - } else {
549   - Log.v(LOG_TAG, "Incoming UUS : NOT present!");
550   - }
551   -
552   - // Make sure there's a leading + on addresses with a TOA of 145
553   - dc.number = PhoneNumberUtils.stringFromStringAndTOA(dc.number, dc.TOA);
554   -
555   - response.add(dc);
556   -
557   - if (dc.isVoicePrivacy) {
558   - mVoicePrivacyOnRegistrants.notifyRegistrants();
559   - Log.d(LOG_TAG, "InCall VoicePrivacy is enabled");
560   - } else {
561   - mVoicePrivacyOffRegistrants.notifyRegistrants();
562   - Log.d(LOG_TAG, "InCall VoicePrivacy is disabled");
563   - }
564   - }
565   -
566   - Collections.sort(response);