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

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

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

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1039370   I116f8fbe6f653e6f72b5ac1a19d942252705584e   Add VoLTE preferred function control flag
1063269   Id41d001d47a03357bfb8b1c595d56f9c4272cf44   tImpl : Avert different threads changes per view.
1069866   I83586dfad6c45117215c0b0db934438519a721dd   SystemUI: Fix SystemUI Force Close
1070394   I61a9c0b203dca879c1420886d06659a277a7ed99   Wifi: Make maximum selective channel scans and interval
1068686   I10c58a58c5b79dd2d7ea081a71f3752dd9928868   Support for configuring captive portal detection enabled
1060185   I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3   Add bound checks to utf16_to_utf8
1066601   I24e51e8a5d185e55cc7d821d1bed70c849f81545   Keyguard: Hide emergency button in OOS

Change-Id: I3a532aa58f6f4f4900cf1f6c427a66e56c8cae36
CRs-Fixed: 1063269, 1039370, 1070394, 1069866, 1068686, 1066601, 1060185
parents dfe17771 77614f65

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -6560,6 +6560,12 @@ public final class Settings { 
         */

        public static final String AIRPLANE_MODE_ON = "airplane_mode_on";



        /**

         * Whether VoLTE Preferred is on

         * @hide

         */

        public static final String VOLTE_PREFERRED_ON = "volte_preferred_on";



        /**

         * Whether Theater Mode is on.

         * {@hide}

core/java/android/view/ViewRootImpl.java

100644 → 100755
+21 −7
Original line number Diff line number Diff line
@@ -3386,6 +3386,7 @@ public final class ViewRootImpl implements ViewParent, 
    private final static int MSG_DISPATCH_WINDOW_SHOWN = 25;

    private final static int MSG_REQUEST_KEYBOARD_SHORTCUTS = 26;

    private final static int MSG_UPDATE_POINTER_ICON = 27;

    private final static int MSG_HIGHTEXT_CONTRAST_CHANGED = 28;



    final class ViewRootHandler extends Handler {

        @Override
@@ -3435,6 +3436,8 @@ public final class ViewRootImpl implements ViewParent, 
                    return "MSG_DISPATCH_WINDOW_SHOWN";

                case MSG_UPDATE_POINTER_ICON:

                    return "MSG_UPDATE_POINTER_ICON";

                case MSG_HIGHTEXT_CONTRAST_CHANGED:

                    return "MSG_HIGHTEXT_CONTRAST_CHANGED";

            }

            return super.getMessageName(message);

        }
@@ -3693,6 +3696,9 @@ public final class ViewRootImpl implements ViewParent, 
                MotionEvent event = (MotionEvent) msg.obj;

                resetPointerIcon(event);

            } break;

            case MSG_HIGHTEXT_CONTRAST_CHANGED: {

                handleHighTextContrastChange(msg.arg1 != 0);

            } break;

            }

        }

    }
@@ -7272,19 +7278,27 @@ public final class ViewRootImpl implements ViewParent, 
        }

    }



    void handleHighTextContrastChange(boolean enabled) {

        mAttachInfo.mHighContrastText = enabled;

        // Destroy Displaylists so they can be recreated with high contrast recordings

        destroyHardwareResources();

        // Schedule redraw, which will rerecord + redraw all text

        invalidate();

    }



    public void dispatchHighTextContrastChange(boolean enabled) {

        Message msg = mHandler.obtainMessage(MSG_HIGHTEXT_CONTRAST_CHANGED);

        msg.arg1 = enabled ? 1 : 0;

        mHandler.sendMessage(msg);

    }



    final class HighContrastTextManager implements HighTextContrastChangeListener {

        HighContrastTextManager() {

            mAttachInfo.mHighContrastText = mAccessibilityManager.isHighTextContrastEnabled();

        }

        @Override

        public void onHighTextContrastStateChanged(boolean enabled) {

            mAttachInfo.mHighContrastText = enabled;



            // Destroy Displaylists so they can be recreated with high contrast recordings

            destroyHardwareResources();



            // Schedule redraw, which will rerecord + redraw all text

            invalidate();

            dispatchHighTextContrastChange(enabled);

        }

    }

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -512,6 +512,9 @@ 
    <!-- Integer indicating RSSI boost given to current network -->

    <integer translatable="false" name="config_wifi_framework_current_network_boost">16</integer>



    <!-- Integer indicating the number of selective channel scan when Wifi turn on -->

    <integer translatable="false" name="config_max_initial_scans_on_selective_channels">2</integer>



    <!-- Integer indicating how to handle beacons with uninitialized RSSI value of 0 -->

    <integer translatable="false" name="config_wifi_framework_scan_result_rssi_level_patchup_value">-85</integer>
@@ -2652,4 +2655,5 @@ 
    <!-- 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>

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

</resources>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ 
  <java-symbol type="integer" name="config_wifi_framework_network_switch_tx_packet_threshold" />

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

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

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

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

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

  <java-symbol type="integer" name="config_bluetooth_max_scan_filters" />
@@ -2735,4 +2736,5 @@ 
  <java-symbol type="integer" name="power_key_hits_emergency" />

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

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

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

</resources>

packages/Keyguard/res/values/bools.xml

100644 → 100755
+1 −0
Original line number Diff line number Diff line
@@ -17,4 +17,5 @@ 
<resources>

    <bool name="kg_show_ime_at_screen_on">true</bool>

    <bool name="kg_use_all_caps">true</bool>

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

</resources>