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

Unverified Commit a1f9ba43 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-10.0.0_r37' into staging/lineage-17.1_merge-android-10.0.0_r37 

Android 10.0.0 Release 37 (QQ3A.200605.001)

* tag 'android-10.0.0_r37':
  Import translations. DO NOT MERGE
  Handle IllegalStateException from TelephonyManager.

Change-Id: I3247cd9e1ee3db9b52e4aa1c1bf1027add8ef669
parents 8eda23a1 6e1e05c9

res/values-ar/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
    <string name="non_primary_user" msgid="315564589279622098">"يمكن لمالك الجهاز فقط الاطّلاع على الأرقام المحظورة وإدارتها."</string>

    <string name="delete_icon_description" msgid="5335959254954774373">"إلغاء الحظر"</string>

    <string name="blocked_numbers_butter_bar_title" msgid="582982373755950791">"تم إيقاف الحظر مؤقتًا"</string>

    <string name="blocked_numbers_butter_bar_body" msgid="1261213114919301485">"بعد الاتصال الهاتفي أو إرسال رسالة نصية إلى رقم طوارئ، يتم إيقاف تشغيل الحظر لضمان تمكن خدمات الطوارئ من الاتصال بك."</string>

    <string name="blocked_numbers_butter_bar_body" msgid="1261213114919301485">"بعد الاتصال الهاتفي أو إرسال رسالة نصية إلى رقم طوارئ، يتم إيقاف تفعيل الحظر لضمان تمكن خدمات الطوارئ من الاتصال بك."</string>

    <string name="blocked_numbers_butter_bar_button" msgid="2704456308072489793">"إعادة تفعيل الآن"</string>

    <string name="blocked_numbers_number_blocked_message" msgid="4314736791180919167">"تم حظر <xliff:g id="BLOCKED_NUMBER">%1$s</xliff:g>"</string>

    <string name="blocked_numbers_number_unblocked_message" msgid="2933071624674945601">"تم إلغاء حظر <xliff:g id="UNBLOCKED_NUMBER">%1$s</xliff:g>"</string>

res/values-be/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    <string name="notification_missedCallTicker" msgid="6731461957487087769">"Прапушчаны выклік ад <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>

    <string name="notification_missedCall_call_back" msgid="7900333283939789732">"Адказаць"</string>

    <string name="notification_missedCall_message" msgid="4054698824390076431">"Паведамленне"</string>

    <string name="accessibility_call_muted" msgid="2968461092554300779">"Выклік сцішаны."</string>

    <string name="accessibility_call_muted" msgid="2968461092554300779">"Гук выключаны."</string>

    <string name="accessibility_speakerphone_enabled" msgid="555386652061614267">"Уключаная гучная сувязь."</string>

    <string name="respond_via_sms_canned_response_1" msgid="6332561460870382561">"Не магу гаварыць. У чым справа?"</string>

    <string name="respond_via_sms_canned_response_2" msgid="2052951316129952406">"Я выклікаю цябе праз момант."</string>

src/com/android/server/telecom/PhoneNumberUtilsAdapterImpl.java

+15 −7
Original line number Diff line number Diff line
@@ -24,16 +24,24 @@ import android.telephony.TelephonyManager; 
public class PhoneNumberUtilsAdapterImpl implements PhoneNumberUtilsAdapter {

    @Override

    public boolean isLocalEmergencyNumber(Context context, String number) {

        try {

            TelephonyManager tm = (TelephonyManager) context.getSystemService(

                    Context.TELEPHONY_SERVICE);

            return tm.isEmergencyNumber(number);

        } catch (IllegalStateException ise) {

            return false;

        }

    }



    @Override

    public boolean isPotentialLocalEmergencyNumber(Context context, String number) {

        try {

            TelephonyManager tm = (TelephonyManager) context.getSystemService(

                    Context.TELEPHONY_SERVICE);

            return tm.isPotentialEmergencyNumber(number);

        } catch (IllegalStateException ise) {

            return false;

        }

    }



    @Override

src/com/android/server/telecom/TelephonyUtil.java

+7 −3
Original line number Diff line number Diff line
@@ -70,8 +70,12 @@ public final class TelephonyUtil { 
    }



    public static boolean shouldProcessAsEmergency(Context context, Uri handle) {

        try {

            TelephonyManager tm = (TelephonyManager) context.getSystemService(

                    Context.TELEPHONY_SERVICE);

            return handle != null && tm.isEmergencyNumber(handle.getSchemeSpecificPart());

        } catch (IllegalStateException ise) {

            return false;

        }

    }

}