Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d5479e8 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5249487 from 64ca10b7 to pi-qpr3-release 

Change-Id: I1f4b67ff99b12f45dd61680be6c7d5df0f773c7d
parents fc4dec32 64ca10b7

core/java/android/webkit/WebViewClient.java

+9 −4
Original line number Diff line number Diff line
@@ -370,11 +370,16 @@ public class WebViewClient { 


    /**

     * Notify the host application that an SSL error occurred while loading a

     * resource. The host application must call either handler.cancel() or

     * handler.proceed(). Note that the decision may be retained for use in

     * resource. The host application must call either {@link SslErrorHandler#cancel} or

     * {@link SslErrorHandler#proceed}. Note that the decision may be retained for use in

     * response to future SSL errors. The default behavior is to cancel the

     * load.

     * <p>

     * This API is only called for recoverable SSL certificate errors. In the case of

     * non-recoverable errors (such as when the server fails the client), WebView will call {@link

     * #onReceivedError(WebView, WebResourceRequest, WebResourceError)} with {@link

     * #ERROR_FAILED_SSL_HANDSHAKE}.

     * <p>

     * Applications are advised not to prompt the user about SSL errors, as

     * the user is unlikely to be able to make an informed security decision

     * and WebView does not provide any UI for showing the details of the
@@ -382,10 +387,10 @@ public class WebViewClient { 
     * <p>

     * Application overrides of this method may display custom error pages or

     * silently log issues, but it is strongly recommended to always call

     * handler.cancel() and never allow proceeding past errors.

     * {@link SslErrorHandler#cancel} and never allow proceeding past errors.

     *

     * @param view The WebView that is initiating the callback.

     * @param handler An SslErrorHandler object that will handle the user's

     * @param handler An {@link SslErrorHandler} that will handle the user's

     *            response.

     * @param error The SSL error object.

     */

core/res/res/values-ar/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1455,7 +1455,7 @@ 
    <string name="vpn_lockdown_config" msgid="8151951501116759194">"‏تغيير إعدادات الشبكة أو الشبكة الافتراضية الخاصة (VPN)"</string>

    <string name="upload_file" msgid="2897957172366730416">"اختيار ملف"</string>

    <string name="no_file_chosen" msgid="6363648562170759465">"لم يتم اختيار أي ملف"</string>

    <string name="reset" msgid="2448168080964209908">"إعادة تعيين"</string>

    <string name="reset" msgid="2448168080964209908">"إعادة الضبط"</string>

    <string name="submit" msgid="1602335572089911941">"إرسال"</string>

    <string name="car_mode_disable_notification_title" msgid="5704265646471239078">"تطبيق القيادة قيد التشغيل"</string>

    <string name="car_mode_disable_notification_message" msgid="7647248420931129377">"انقر للخروج من تطبيق القيادة."</string>

core/res/res/values-as/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1173,7 +1173,7 @@ 
    <string name="network_available_sign_in" msgid="1848877297365446605">"নেটৱৰ্কত ছাইন ইন কৰক"</string>

    <!-- no translation found for network_available_sign_in_detailed (8000081941447976118) -->

    <skip />

    <string name="wifi_no_internet" msgid="8938267198124654938">"ৱাই-ফাইত ইন্টাৰনেট নাই"</string>

    <string name="wifi_no_internet" msgid="8938267198124654938">"ৱাই-ফাইত ইণ্টাৰনেট নাই"</string>

    <string name="wifi_no_internet_detailed" msgid="8083079241212301741">"অধিক বিকল্পৰ বাবে টিপক"</string>

    <string name="wifi_softap_config_change" msgid="8475911871165857607">"আপোনাৰ হটস্পট ছেটিংসমূহত কৰা সালসলনি"</string>

    <string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"আপোনাৰ হটস্পটৰ বেণ্ড সলনি কৰা হ’ল।"</string>

core/res/res/values-be/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
    <string name="CLIRDefaultOffNextCallOff" msgid="2567998633124408552">"Налады ідэнтыфікатару АВН па змаўчанні: не абмяжавана. Наступны выклік: не абмежавана"</string>

    <string name="serviceNotProvisioned" msgid="8614830180508686666">"Служба не прадастаўляецца."</string>

    <string name="CLIRPermanent" msgid="3377371145926835671">"Вы не можаце змяніць налады ідэнтыфікатара абанента, якi тэлефануе."</string>

    <string name="RestrictedOnDataTitle" msgid="5221736429761078014">"Мабільны інтэрнэт недаступны"</string>

    <string name="RestrictedOnDataTitle" msgid="5221736429761078014">"Мабільная перадача даных недаступная"</string>

    <string name="RestrictedOnEmergencyTitle" msgid="6855466023161191166">"Экстранныя выклікі недаступныя"</string>

    <string name="RestrictedOnNormalTitle" msgid="3179574012752700984">"Няма сэрвісу галасавых выклікаў"</string>

    <string name="RestrictedOnAllVoiceTitle" msgid="8037246983606545202">"Галасавыя або экстранныя выклікі недаступныя"</string>
@@ -416,7 +416,7 @@ 
    <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Гэта праграма можа атрымліваць звесткі пра ваша месцазнаходжанне на падставе даных сеткавых крыніц, такіх як вышкі сотавай сувязі і сеткі Wi-Fi. Гэтыя сэрвісы вызначэння месцазнаходжання павінны быць уключаны i даступныя на вашым тэлефоне, каб праграма магла іх выкарыстоўваць."</string>

    <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"змяняць налады аудыё"</string>

    <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Дазваляе прыкладанням змяняць глабальныя налады гуку, такія як моц і тое, што дынамік выкарыстоўваецца для выхаду."</string>

    <string name="permlab_recordAudio" msgid="3876049771427466323">"запісваць аўдыё"</string>

    <string name="permlab_recordAudio" msgid="3876049771427466323">"запіс аўдыя"</string>

    <string name="permdesc_recordAudio" msgid="4245930455135321433">"Гэта праграма можа у любы час запісваць аўдыя, выкарыстоўваючы мікрафон."</string>

    <string name="permlab_sim_communication" msgid="2935852302216852065">"адпраўляць каманды на SIM-карту"</string>

    <string name="permdesc_sim_communication" msgid="5725159654279639498">"Дазваляе праграме адпраўляць каманды SIM-карце. Гэта вельмі небяспечна."</string>

core/res/res/values-bs/strings.xml

+5 −5
Original line number Diff line number Diff line
@@ -147,9 +147,9 @@ 
    <string name="httpErrorOk" msgid="1191919378083472204">"Uredu"</string>

    <string name="httpError" msgid="7956392511146698522">"Došlo je do greške na mreži."</string>

    <string name="httpErrorLookup" msgid="4711687456111963163">"Pronalaženje URL-a nije uspjelo."</string>

    <string name="httpErrorUnsupportedAuthScheme" msgid="6299980280442076799">"Shema za provjeru vjerodostojnosti stranice nije podržana."</string>

    <string name="httpErrorAuth" msgid="1435065629438044534">"Došlo je do greške prilikom provjere vjerodostojnosti."</string>

    <string name="httpErrorProxyAuth" msgid="1788207010559081331">"Došlo je do greške prilikom provjere vjerodostojnosti preko proksi servera."</string>

    <string name="httpErrorUnsupportedAuthScheme" msgid="6299980280442076799">"Shema za autentifikaciju stranice nije podržana."</string>

    <string name="httpErrorAuth" msgid="1435065629438044534">"Došlo je do greške prilikom autentifikacije."</string>

    <string name="httpErrorProxyAuth" msgid="1788207010559081331">"Došlo je do greške prilikom autentifikacije preko proksi servera."</string>

    <string name="httpErrorConnect" msgid="8714273236364640549">"Povezivanje sa serverom nije uspjelo."</string>

    <string name="httpErrorIO" msgid="2340558197489302188">"Veza sa serverom nije uspostavljena. Pokušajte ponovo kasnije."</string>

    <string name="httpErrorTimeout" msgid="4743403703762883954">"Vrijeme za uspostavljanje veze sa serverom je isteklo."</string>
@@ -494,7 +494,7 @@ 
    <string name="permlab_manageFingerprint" msgid="5640858826254575638">"upravljanje hardverom za otiske prstiju"</string>

    <string name="permdesc_manageFingerprint" msgid="178208705828055464">"Omogućava aplikaciji da koristi metode za dodavanje i brisanje šablona otisaka prstiju za upotrebu."</string>

    <string name="permlab_useFingerprint" msgid="3150478619915124905">"korištenje hardvera za otiske prstiju"</string>

    <string name="permdesc_useFingerprint" msgid="9165097460730684114">"Omogućava aplikaciji da za provjeru vjerodostojnosti koristi hardver za otiske prstiju"</string>

    <string name="permdesc_useFingerprint" msgid="9165097460730684114">"Omogućava aplikaciji da za autentifikaciju koristi hardver za otiske prstiju"</string>

    <string name="fingerprint_acquired_partial" msgid="735082772341716043">"Otkriven je djelomičan otisak prsta. Pokušajte ponovo."</string>

    <string name="fingerprint_acquired_insufficient" msgid="4596546021310923214">"Nije uspjela obrada otiska prsta. Pokušajte ponovo."</string>

    <string name="fingerprint_acquired_imager_dirty" msgid="1087209702421076105">"Senzor za otisak prsta je prljav. Očistite ga i pokušajte ponovo."</string>
@@ -1558,7 +1558,7 @@ 
    <string name="kg_invalid_puk" msgid="3638289409676051243">"Ponovo unesite ispravan PUK kôd. Ponovljeni pokušaji će trajno onemogućiti SIM."</string>

    <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN-ovi se ne poklapaju"</string>

    <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Previše pokušaja otključavanja pomoću uzorka"</string>

    <string name="kg_login_instructions" msgid="1100551261265506448">"Da otključate, prijavite se sa svojim Google računom."</string>

    <string name="kg_login_instructions" msgid="1100551261265506448">"Da otključate, prijavite se pomoću svog Google računa."</string>

    <string name="kg_login_username_hint" msgid="5718534272070920364">"Korisničko ime (adresa e-pošte)"</string>

    <string name="kg_login_password_hint" msgid="9057289103827298549">"Lozinka"</string>

    <string name="kg_login_submit_button" msgid="5355904582674054702">"Prijava"</string>