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

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

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

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1054138   I91fa808071f2e30316149cbe4532c00e50df03ec   FR 36773: Emergency Call on Power key Tapping
1052202   Id933bde87a16dac29ba9af9bae371c07665ff282   SystemUI: Fix systemui crash issue
771756   If02b398d5eb3520f173d7b71a11df2536a218bc1   Mms: Fix no ringtone for MT SMS during the call.
1046939   Iefb169c237c1ca037b4451ced250449945038e84   Alarm: ignore back key during power off alarm
1041754   I97fb81c23a94c18a37c251337ef48f62d26240a7   MSIM: Fix to show PUK view when two sims locked on PIN.
1037633   Ia9129badaac84b57d6cfde2b5d160e7a294397bb   Update the customize date format
1057424   If697fc972b9f2247dc9eb4522c156830568c50b1   base: fix ClassCastException in MenuPopupWindow
1058803   Ia9806014040b4ad1645e77bc885e11601b1d8411   Wifi: Introduce a config parameter for IpReachabilityMon
942020   I339a2c411f94572c00e9df48deb38aab1046e581   Ignore IMS type APN when notify data connection

Change-Id: I28b8ac0e7983c0d77165a1b5bb348d5ae5ba7f83
CRs-Fixed: 1052202, 771756, 1058803, 1046939, 1037633, 942020, 1057424, 1041754, 1054138
parents 4404f4a2 de9c116e

core/java/android/widget/MenuPopupWindow.java

+10 −2
Original line number Diff line number Diff line
@@ -138,7 +138,15 @@ public class MenuPopupWindow extends ListPopupWindow implements MenuItemHoverLis 
                setNextSelectedPositionInt(INVALID_POSITION);



                // Close only the top-level menu.

                ((MenuAdapter) getAdapter()).getAdapterMenu().close(false /* closeAllMenus */);

                final ListAdapter adapter = getAdapter();

                final MenuAdapter menuAdapter;

                if (adapter instanceof HeaderViewListAdapter) {

                    final HeaderViewListAdapter headerAdapter = (HeaderViewListAdapter) adapter;

                    menuAdapter = (MenuAdapter) headerAdapter.getWrappedAdapter();

                } else {

                    menuAdapter = (MenuAdapter) adapter;

                }

                menuAdapter.getAdapterMenu().close(false /* closeAllMenus */);

                return true;

            }

            return super.onKeyDown(keyCode, event);

core/res/res/values/config.xml

+13 −0
Original line number Diff line number Diff line
@@ -428,6 +428,9 @@ 
    <!-- Boolean indicating whether or not wifi firmware debugging is enabled -->

    <bool translatable="false" name="config_wifi_enable_wifi_firmware_debugging">true</bool>



    <!-- IpReachability monitor enable/Disable -->

    <bool translatable="false" name="config_wifi_ipreachability_monitor">false</bool>



    <!-- Integer size limit, in KB, for a single WifiLogger ringbuffer -->

    <integer translatable="false" name="config_wifi_logger_ring_buffer_size_limit_kb">32</integer>
@@ -2637,4 +2640,14 @@ 
    <bool name="config_regional_hotspot_show_broadcast_ssid_checkbox">false</bool>

    <bool name="config_regional_hotspot_show_notification_when_turn_on">false</bool>

    <bool name="config_passpoint_setting_on">false</bool>

    <!-- Emergency Number to be invoked when Power key is pressed.

         Default value is set to 112 as this FR is mainly intended

         for Indian market-->

    <string name="power_key_emergency_number">112</string>

    <!-- Number of power key hits to invoke emergency call -->

    <integer name="power_key_hits_emergency">3</integer>



    <!-- Allow the gesture to tap the power button N times to start

         the Emergency Call while the device is non-interactive. -->

    <bool name="config_emergencyCallOnPowerkeyTapGestureEnabled">false</bool>

</resources>

core/res/res/values/customize.xml

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-->



<resources>

    <!-- custom date format or not  -->

    <bool name="config_dateformat">false</bool>



    <!-- Used in LocalePicker, default language must be contained -->

    <string name="locale_codes" translatable="false"></string>

core/res/res/values/symbols.xml

+6 −1
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ 
  <java-symbol type="bool" name="config_wifi_enable_disconnection_debounce" />

  <java-symbol type="bool" name="config_wifi_revert_country_code_on_cellular_loss" />

  <java-symbol type="bool" name="config_wifi_enable_wifi_firmware_debugging" />

  <java-symbol type="bool" name="config_wifi_ipreachability_monitor" />

  <java-symbol type="integer" name="config_wifi_logger_ring_buffer_size_limit_kb" />

  <java-symbol type="bool" name="config_wifi_turn_off_during_emergency_call" />

  <java-symbol type="bool" name="config_supportMicNearUltrasound" />
@@ -2416,7 +2417,7 @@ 
  <java-symbol type="drawable" name="platlogo_m" />

  <!-- language/locale picker extention feature -->

  <java-symbol type="string" name="locale_codes" />



  <java-symbol type="bool" name="config_dateformat" />

  <java-symbol type="string" name="config_iccHotswapPromptForRestartDialogComponent" />



  <java-symbol type="string" name="config_packagedKeyboardName" />
@@ -2729,4 +2730,8 @@ 
  <java-symbol type="integer" name="wifi_hotspot_security_type" />

  <java-symbol type="string" name="def_wifi_wifihotspot_pass" />

  <java-symbol type="string" name="def_wifi_direct_name" />



  <java-symbol type="string" name="power_key_emergency_number" />

  <java-symbol type="integer" name="power_key_hits_emergency" />

  <java-symbol type="bool" name="config_emergencyCallOnPowerkeyTapGestureEnabled" />

</resources>

packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java

100644 → 100755
+5 −5
Original line number Diff line number Diff line
@@ -57,16 +57,16 @@ public class KeyguardSecurityModel { 
    SecurityMode getSecurityMode() {

        KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext);



        if (SubscriptionManager.isValidSubscriptionId(

                monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED))) {

            return SecurityMode.SimPin;

        }



        if (mIsPukScreenAvailable && SubscriptionManager.isValidSubscriptionId(

                monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED))) {

            return SecurityMode.SimPuk;

        }



        if (SubscriptionManager.isValidSubscriptionId(

                monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED))) {

            return SecurityMode.SimPin;

        }



        final int security = mLockPatternUtils.getActivePasswordQuality(

                KeyguardUpdateMonitor.getCurrentUser());

        switch (security) {