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

Commit 8f2709e0 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12173239 from 640ed5aa to 24Q4-release 

Change-Id: I0f01056f77c030d59ab6d8ccabef329d8d386aad
parents 2950eeff 640ed5aa

AconfigFlags.bp

+7 −0
Original line number Original line Diff line number Diff line
@@ -99,6 +99,7 @@ aconfig_declarations_group { 
        "framework_graphics_flags_java_lib",

        "framework_graphics_flags_java_lib",

        "hwui_flags_java_lib",

        "hwui_flags_java_lib",

        "libcore_exported_aconfig_flags_lib",

        "libcore_exported_aconfig_flags_lib",

        "libgui_flags_java_lib",

        "power_flags_lib",

        "power_flags_lib",

        "sdk_sandbox_flags_lib",

        "sdk_sandbox_flags_lib",

        "surfaceflinger_flags_java_lib",

        "surfaceflinger_flags_java_lib",
@@ -1208,6 +1209,12 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

}





java_aconfig_library {

    name: "libgui_flags_java_lib",

    aconfig_declarations: "libgui_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Content Capture

// Content Capture

aconfig_declarations {

aconfig_declarations {

    name: "android.view.contentcapture.flags-aconfig",

    name: "android.view.contentcapture.flags-aconfig",

OWNERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ michaelwr@google.com #{LAST_RESORT_SUGGESTION} 
nandana@google.com #{LAST_RESORT_SUGGESTION}

nandana@google.com #{LAST_RESORT_SUGGESTION}

narayan@google.com #{LAST_RESORT_SUGGESTION}

narayan@google.com #{LAST_RESORT_SUGGESTION}

ogunwale@google.com #{LAST_RESORT_SUGGESTION}

ogunwale@google.com #{LAST_RESORT_SUGGESTION}

omakoto@google.com #{LAST_RESORT_SUGGESTION}

roosa@google.com #{LAST_RESORT_SUGGESTION}

roosa@google.com #{LAST_RESORT_SUGGESTION}

smoreland@google.com #{LAST_RESORT_SUGGESTION}

smoreland@google.com #{LAST_RESORT_SUGGESTION}

yamasani@google.com #{LAST_RESORT_SUGGESTION}

yamasani@google.com #{LAST_RESORT_SUGGESTION}

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+22 −2
Original line number Original line Diff line number Diff line
@@ -165,6 +165,7 @@ import com.android.server.SystemService; 
import com.android.server.SystemServiceManager;

import com.android.server.SystemServiceManager;

import com.android.server.SystemTimeZone;

import com.android.server.SystemTimeZone;

import com.android.server.SystemTimeZone.TimeZoneConfidence;

import com.android.server.SystemTimeZone.TimeZoneConfidence;

import com.android.server.pm.UserManagerInternal;

import com.android.server.pm.permission.PermissionManagerService;

import com.android.server.pm.permission.PermissionManagerService;

import com.android.server.pm.permission.PermissionManagerServiceInternal;

import com.android.server.pm.permission.PermissionManagerServiceInternal;

import com.android.server.pm.pkg.AndroidPackage;

import com.android.server.pm.pkg.AndroidPackage;
@@ -3763,9 +3764,11 @@ public class AlarmManagerService extends SystemService { 
            }

            }

            mNextAlarmClockForUser.put(userId, alarmClock);

            mNextAlarmClockForUser.put(userId, alarmClock);

            if (mStartUserBeforeScheduledAlarms) {

            if (mStartUserBeforeScheduledAlarms) {

                if (shouldAddWakeupForUser(userId)) {

                    mUserWakeupStore.addUserWakeup(userId, convertToElapsed(

                    mUserWakeupStore.addUserWakeup(userId, convertToElapsed(

                            mNextAlarmClockForUser.get(userId).getTriggerTime(), RTC));

                            mNextAlarmClockForUser.get(userId).getTriggerTime(), RTC));

                }

                }

            }

        } else {

        } else {

            if (DEBUG_ALARM_CLOCK) {

            if (DEBUG_ALARM_CLOCK) {

                Log.v(TAG, "Next AlarmClockInfoForUser(" + userId + "): None");

                Log.v(TAG, "Next AlarmClockInfoForUser(" + userId + "): None");
@@ -3783,6 +3786,23 @@ public class AlarmManagerService extends SystemService { 
        mHandler.sendEmptyMessage(AlarmHandler.SEND_NEXT_ALARM_CLOCK_CHANGED);

        mHandler.sendEmptyMessage(AlarmHandler.SEND_NEXT_ALARM_CLOCK_CHANGED);

    }

    }





    /**

     * Checks whether the user is of type that needs to be started before the alarm.

     */

    @VisibleForTesting

    boolean shouldAddWakeupForUser(@UserIdInt int userId) {

        final UserManagerInternal umInternal = LocalServices.getService(UserManagerInternal.class);

        if (umInternal.getUserInfo(userId) == null || umInternal.getUserInfo(userId).isGuest()) {

            // Guest user should not be started in the background.

            return false;

        } else {

            // SYSTEM user is always running, so no need to schedule wakeup for it.

            // Profiles are excluded from the wakeup list because users can explicitly stop them and

            // so starting them in the background would go against the user's intent.

            return userId != UserHandle.USER_SYSTEM && umInternal.getUserInfo(userId).isFull();

        }

    }



    /**

    /**

     * Updates NEXT_ALARM_FORMATTED and sends NEXT_ALARM_CLOCK_CHANGED_INTENT for all users

     * Updates NEXT_ALARM_FORMATTED and sends NEXT_ALARM_CLOCK_CHANGED_INTENT for all users

     * for which alarm clocks have changed since the last call to this.

     * for which alarm clocks have changed since the last call to this.

apex/jobscheduler/service/java/com/android/server/alarm/UserWakeupStore.java

+3 −7
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ package com.android.server.alarm; 
import android.annotation.Nullable;

import android.annotation.Nullable;

import android.os.Environment;

import android.os.Environment;

import android.os.SystemClock;

import android.os.SystemClock;

import android.os.UserHandle;

import android.util.AtomicFile;

import android.util.AtomicFile;

import android.util.IndentingPrintWriter;

import android.util.IndentingPrintWriter;

import android.util.Pair;

import android.util.Pair;
@@ -119,14 +118,11 @@ public class UserWakeupStore { 
     * @param alarmTime time when alarm is expected to trigger.

     * @param alarmTime time when alarm is expected to trigger.

     */

     */

    public void addUserWakeup(int userId, long alarmTime) {

    public void addUserWakeup(int userId, long alarmTime) {

        // SYSTEM user is always running, so no need to schedule wakeup for it.

        if (userId != UserHandle.USER_SYSTEM) {

        synchronized (mUserWakeupLock) {

        synchronized (mUserWakeupLock) {

            mUserStarts.put(userId, alarmTime - BUFFER_TIME_MS + getUserWakeupOffset());

            mUserStarts.put(userId, alarmTime - BUFFER_TIME_MS + getUserWakeupOffset());

        }

        }

        updateUserListFile();

        updateUserListFile();

    }

    }

    }





    /**

    /**

     * Remove wakeup scheduled for the user with given userId if present.

     * Remove wakeup scheduled for the user with given userId if present.

core/api/current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -43729,6 +43729,7 @@ package android.telephony { 
    field public static final String KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY = "carrier_nr_availabilities_int_array";

    field public static final String KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY = "carrier_nr_availabilities_int_array";

    field public static final String KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL = "carrier_provisions_wifi_merged_networks_bool";

    field public static final String KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL = "carrier_provisions_wifi_merged_networks_bool";

    field public static final String KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL = "carrier_rcs_provisioning_required_bool";

    field public static final String KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL = "carrier_rcs_provisioning_required_bool";

    field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_CARRIER_ROAMING_NTN_EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_INT = "carrier_roaming_ntn_emergency_call_to_satellite_handover_type_int";

    field public static final String KEY_CARRIER_SERVICE_NAME_STRING_ARRAY = "carrier_service_name_array";

    field public static final String KEY_CARRIER_SERVICE_NAME_STRING_ARRAY = "carrier_service_name_array";

    field public static final String KEY_CARRIER_SERVICE_NUMBER_STRING_ARRAY = "carrier_service_number_array";

    field public static final String KEY_CARRIER_SERVICE_NUMBER_STRING_ARRAY = "carrier_service_number_array";

    field public static final String KEY_CARRIER_SETTINGS_ACTIVITY_COMPONENT_NAME_STRING = "carrier_settings_activity_component_name_string";

    field public static final String KEY_CARRIER_SETTINGS_ACTIVITY_COMPONENT_NAME_STRING = "carrier_settings_activity_component_name_string";
@@ -43911,6 +43912,7 @@ package android.telephony { 
    field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_SATELLITE_ENTITLEMENT_STATUS_REFRESH_DAYS_INT = "satellite_entitlement_status_refresh_days_int";

    field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_SATELLITE_ENTITLEMENT_STATUS_REFRESH_DAYS_INT = "satellite_entitlement_status_refresh_days_int";

    field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL = "satellite_entitlement_supported_bool";

    field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL = "satellite_entitlement_supported_bool";

    field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_ESOS_SUPPORTED_BOOL = "satellite_esos_supported_bool";

    field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_ESOS_SUPPORTED_BOOL = "satellite_esos_supported_bool";

    field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT = "satellite_screen_off_inactivity_timeout_duration_sec_int";

    field public static final String KEY_SHOW_4G_FOR_3G_DATA_ICON_BOOL = "show_4g_for_3g_data_icon_bool";

    field public static final String KEY_SHOW_4G_FOR_3G_DATA_ICON_BOOL = "show_4g_for_3g_data_icon_bool";

    field public static final String KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL = "show_4g_for_lte_data_icon_bool";

    field public static final String KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL = "show_4g_for_lte_data_icon_bool";

    field public static final String KEY_SHOW_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool";

    field public static final String KEY_SHOW_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool";