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

Commit b08554da authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android-framework.lnx.2.0-00007. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1056166   Ib921dc2f130c2e4002b3cfb58098b8e05ea8a86c   Keyguard: Fix incorrect sim pin code counting issue
1049393   Id518ec2ccdc9b27fc073b7ec8bcaa6b285190ede   Interface to check for deferred messages

Change-Id: I4ae25eae7802f341abbf364e0588d990b84d6db5
CRs-Fixed: 1056166, 1049393
parents 46bde45c a3238fe9

core/java/com/android/internal/util/StateMachine.java

+16 −0
Original line number Diff line number Diff line
@@ -1921,6 +1921,22 @@ public class StateMachine { 
        return false;

    }



    /**

     * Check if there are any pending messages with code 'what' in deferred messages queue.

     */

    protected final boolean hasDeferredMessages(int what, Object obj) {

        SmHandler smh = mSmHandler;

        if (smh == null) return false;



        Iterator<Message> iterator = smh.mDeferredMessages.iterator();

        while (iterator.hasNext()) {

            Message msg = iterator.next();

            if ((msg.what == what) && (msg.obj == obj)) return true;

        }



        return false;

    }



    /**

     * Check if there are any pending posts of messages with code 'what' in

     * the message queue. This does NOT check messages in deferred message queue.

packages/Keyguard/res/values-zh-rCN/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -95,9 +95,9 @@ 
    <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"您已连续 <xliff:g id="NUMBER_0">%1$d</xliff:g> 次画错解锁图案。如果再尝试 <xliff:g id="NUMBER_1">%2$d</xliff:g> 次后仍不成功，系统就会要求您使用自己的电子邮件帐号解锁平板电脑。\n\n请在 <xliff:g id="NUMBER_2">%3$d</xliff:g> 秒后重试。"</string>

    <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"您已连续 <xliff:g id="NUMBER_0">%1$d</xliff:g> 次画错解锁图案。如果再尝试 <xliff:g id="NUMBER_1">%2$d</xliff:g> 次后仍不成功，系统就会要求您使用自己的电子邮件帐号解锁手机。\n\n请在 <xliff:g id="NUMBER_2">%3$d</xliff:g> 秒后重试。"</string>

    <string name="kg_password_wrong_pin_code_pukked" msgid="30531039455764924">"SIM卡PIN码不正确，您现在必须联系运营商为您解锁设备。"</string>

    <plurals name="kg_password_wrong_pin_code" formatted="false" msgid="6721575017538162249">

      <item quantity="other">SIM 卡 PIN 码不正确，您还可尝试 <xliff:g id="NUMBER_1">%d</xliff:g> 次。</item>

      <item quantity="one">SIM 卡 PIN 码不正确，您还可尝试 <xliff:g id="NUMBER_0">%d</xliff:g> 次。如果仍不正确，则需要联系运营商帮您解锁设备。</item>

    <plurals name="kg_password_wrong_pin_code">

        <item quantity="one">SIM<xliff:g id="slotid">%d</xliff:g>卡 PIN 码不正确, 您还可尝试  <xliff:g id="number">%d</xliff:g>次。如果仍不正确，则需要联系运营商帮您解锁设备。</item>

        <item quantity="other">SIM<xliff:g id="slotid">%d</xliff:g>卡 PIN 码不正确, 您还可尝试<xliff:g id="number">%d</xliff:g> 次。</item>

    </plurals>

    <string name="kg_password_wrong_puk_code_dead" msgid="7077536808291316208">"SIM卡无法使用，请与您的运营商联系。"</string>

    <plurals name="kg_password_wrong_puk_code" formatted="false" msgid="7576227366999858780">