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

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

Merge 46bde45c on remote branch 

Change-Id: Ic29e95eb9fd732a9ed018367b9c35862e95c5b17
parents 79894a4e 46bde45c

core/java/android/provider/CallLog.java

+19 −1
Original line number Diff line number Diff line
@@ -203,6 +203,23 @@ public class CallLog { 
         * @hide

         */

        public static final int ANSWERED_EXTERNALLY_TYPE = 7;

        /** Call log type for missed IMS calls. */

        private static final int MISSED_IMS_TYPE = 10;

        /**

         * Call log type for incoming WiFi calls.

         * @hide

         */

        public static final int INCOMING_WIFI_TYPE = 20;

        /**

         * Call log type for outgoing WiFi calls.

         * @hide

         */

        public static final int OUTGOING_WIFI_TYPE = 21;

        /**

         * Call log type for missed WiFi calls.

         * @hide

         */

        public static final int MISSED_WIFI_TYPE = 22;



        /**

         * Bit-mask describing features of the call (e.g. video).
@@ -648,7 +665,8 @@ public class CallLog { 
            values.put(NEW, Integer.valueOf(1));

            values.put(ADD_FOR_ALL_USERS, addForAllUsers ? 1 : 0);



            if (callType == MISSED_TYPE) {

            if (callType == MISSED_TYPE || callType == MISSED_IMS_TYPE

                    || callType == MISSED_WIFI_TYPE) {

                values.put(IS_READ, Integer.valueOf(is_read ? 1 : 0));

            }

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/java/com/android/server/SystemConfig.java

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.pm.PackageManager; 
import android.os.Environment;

import android.os.Process;

import android.os.storage.StorageManager;

import android.os.SystemProperties;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.Slog;
@@ -201,6 +202,11 @@ public class SystemConfig { 
                Environment.getOemDirectory(), "etc", "sysconfig"), ALLOW_FEATURES);

        readPermissions(Environment.buildPath(

                Environment.getOemDirectory(), "etc", "permissions"), ALLOW_FEATURES);

        //Remove vulkan specific features

        if (SystemProperties.getBoolean("persist.graphics.vulkan.disable", false)) {

            removeFeature(PackageManager.FEATURE_VULKAN_HARDWARE_LEVEL);

            removeFeature(PackageManager.FEATURE_VULKAN_HARDWARE_VERSION);

        }

    }



    void readPermissions(File libraryDir, int permissionFlag) {

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>