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

Commit 2ac6e165 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [3436310, 3434392, 3435998, 3435077, 3435273, 3436350,... 

Merge cherrypicks of [3436310, 3434392, 3435998, 3435077, 3435273, 3436350, 3434393, 3434394, 3434395, 3434696, 3435999, 3434352, 3434353, 3434354, 3435080, 3436041, 3434355, 3435813, 3435082, 3435084, 3434396, 3434397, 3436061, 3436000] into oc-m2-release

Change-Id: I0e2fceb57ae7623495c27bcb0071276669b6bb23
parents 45e8332b db03f06c

core/java/android/provider/CallLog.java

+6 −0
Original line number Diff line number Diff line
@@ -223,6 +223,12 @@ public class CallLog { 
        /** Call was WIFI call. */

        public static final int FEATURES_WIFI = 0x8;



        /**

         * Indicates the call underwent Assisted Dialing.

         * @hide

         */

        public static final Integer FEATURES_ASSISTED_DIALING_USED = 0x10;



        /**

         * The phone number as the user entered it.

         * <P>Type: TEXT</P>

core/java/com/android/internal/colorextraction/types/Tonal.java

+5 −3
Original line number Diff line number Diff line
@@ -51,9 +51,11 @@ public class Tonal implements ExtractionType { 


    private static final boolean DEBUG = true;



    public static final int THRESHOLD_COLOR_LIGHT = 0xffe0e0e0;

    public static final int MAIN_COLOR_LIGHT = 0xffe0e0e0;

    public static final int SECONDARY_COLOR_LIGHT = 0xff9e9e9e;

    public static final int MAIN_COLOR_DARK = 0xff212121;

    public static final int THRESHOLD_COLOR_DARK = 0xff212121;

    public static final int MAIN_COLOR_DARK = 0xff000000;

    public static final int SECONDARY_COLOR_DARK = 0xff000000;



    private final TonalPalette mGreyPalette;
@@ -197,12 +199,12 @@ public class Tonal implements ExtractionType { 
        // light fallback or darker than our dark fallback.

        ColorUtils.colorToHSL(mainColor, mTmpHSL);

        final float mainLuminosity = mTmpHSL[2];

        ColorUtils.colorToHSL(MAIN_COLOR_LIGHT, mTmpHSL);

        ColorUtils.colorToHSL(THRESHOLD_COLOR_LIGHT, mTmpHSL);

        final float lightLuminosity = mTmpHSL[2];

        if (mainLuminosity > lightLuminosity) {

            return false;

        }

        ColorUtils.colorToHSL(MAIN_COLOR_DARK, mTmpHSL);

        ColorUtils.colorToHSL(THRESHOLD_COLOR_DARK, mTmpHSL);

        final float darkLuminosity = mTmpHSL[2];

        if (mainLuminosity < darkLuminosity) {

            return false;

proto/src/metrics_constants.proto

+4 −0
Original line number Diff line number Diff line
@@ -4567,6 +4567,10 @@ message MetricsEvent { 
    // OS: O MR

    COLOR_MODE_SETTINGS = 1143;



    // Enclosing category for group of APP_TRANSITION_FOO events,

    // logged when we cancel an app transition.

    APP_TRANSITION_CANCELLED = 1144;



    // ---- End O-MR1 Constants, all O-MR1 constants go above this line ----



    // Add new aosp constants above this line.

proto/src/wifi.proto

+28 −0
Original line number Diff line number Diff line
@@ -336,6 +336,34 @@ message WifiLog { 


  // Count of connection attempts that were initiated unsuccessfully

  optional int32 num_open_network_connect_message_failed_to_send = 82;



  // Histogram counting instances of scans with N many HotSpot 2.0 R1 APs

  repeated NumConnectableNetworksBucket observed_hotspot_r1_aps_in_scan_histogram = 83;



  // Histogram counting instances of scans with N many HotSpot 2.0 R2 APs

  repeated NumConnectableNetworksBucket observed_hotspot_r2_aps_in_scan_histogram = 84;



  // Histogram counting instances of scans with N many unique HotSpot 2.0 R1 ESS.

  // Where ESS is defined as the (HESSID, ANQP Domain ID), (SSID, ANQP Domain ID) or

  // (SSID, BSSID) tuple depending on AP configuration (in the above priority

  // order).

  repeated NumConnectableNetworksBucket observed_hotspot_r1_ess_in_scan_histogram = 85;



  // Histogram counting instances of scans with N many unique HotSpot 2.0 R2 ESS.

  // Where ESS is defined as the (HESSID, ANQP Domain ID), (SSID, ANQP Domain ID) or

  // (SSID, BSSID) tuple depending on AP configuration (in the above priority

  // order).

  repeated NumConnectableNetworksBucket observed_hotspot_r2_ess_in_scan_histogram = 86;



  // Histogram counting number of HotSpot 2.0 R1 APs per observed ESS in a scan

  // (one value added per unique ESS - potentially multiple counts per single

  // scan!)

  repeated NumConnectableNetworksBucket observed_hotspot_r1_aps_per_ess_in_scan_histogram = 87;



  // Histogram counting number of HotSpot 2.0 R2 APs per observed ESS in a scan

  // (one value added per unique ESS - potentially multiple counts per single

  // scan!)

  repeated NumConnectableNetworksBucket observed_hotspot_r2_aps_per_ess_in_scan_histogram = 88;

}



// Information that gets logged for every WiFi connection.

services/core/java/com/android/server/am/ActivityManagerDebugConfig.java

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ class ActivityManagerDebugConfig { 
    static final boolean DEBUG_USAGE_STATS = DEBUG_ALL || false;

    static final boolean DEBUG_PERMISSIONS_REVIEW = DEBUG_ALL || false;

    static final boolean DEBUG_WHITELISTS = DEBUG_ALL || false;

    static final boolean DEBUG_METRICS = DEBUG_ALL || false;



    static final String POSTFIX_ADD_REMOVE = (APPEND_CATEGORY_NAME) ? "_AddRemove" : "";

    static final String POSTFIX_APP = (APPEND_CATEGORY_NAME) ? "_App" : "";