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

Commit 240df108 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12032893 from 79c50f68 to 24Q4-release 

Change-Id: Ia1fb8c91fe1a62c084426c53d9f65a8df0b36114
parents 98be986e 79c50f68

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -43901,6 +43901,7 @@ package android.telephony { 
    field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_SATELLITE_CONNECTION_HYSTERESIS_SEC_INT = "satellite_connection_hysteresis_sec_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_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_ESOS_SUPPORTED_BOOL = "satellite_esos_supported_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_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool";

core/java/android/provider/Telephony.java

+13 −3
Original line number Diff line number Diff line
@@ -4940,7 +4940,7 @@ public final class Telephony { 
         *

         * @hide

         */

        public static final String COLUMN_IS_NTN = "is_ntn";

        public static final String COLUMN_IS_ONLY_NTN = "is_only_ntn";



        /**

         * TelephonyProvider column name for transferred status
@@ -4976,6 +4976,15 @@ public final class Telephony { 
        public static final String COLUMN_SATELLITE_ENTITLEMENT_PLMNS =

                "satellite_entitlement_plmns";



        /**

         * TelephonyProvider column name to indicate the satellite ESOS supported. The value of this

         * column is set based on {@link CarrierConfigManager#KEY_SATELLITE_ESOS_SUPPORTED_BOOL}.

         * By default, it's disabled.

         *

         * @hide

         */

        public static final String COLUMN_SATELLITE_ESOS_SUPPORTED = "satellite_esos_supported";



        /** All columns in {@link SimInfo} table. */

        private static final List<String> ALL_COLUMNS = List.of(

                COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID,
@@ -5047,11 +5056,12 @@ public final class Telephony { 
                COLUMN_USER_HANDLE,

                COLUMN_SATELLITE_ENABLED,

                COLUMN_SATELLITE_ATTACH_ENABLED_FOR_CARRIER,

                COLUMN_IS_NTN,

                COLUMN_IS_ONLY_NTN,

                COLUMN_SERVICE_CAPABILITIES,

                COLUMN_TRANSFER_STATUS,

                COLUMN_SATELLITE_ENTITLEMENT_STATUS,

                COLUMN_SATELLITE_ENTITLEMENT_PLMNS

                COLUMN_SATELLITE_ENTITLEMENT_PLMNS,

                COLUMN_SATELLITE_ESOS_SUPPORTED

        );



        /**

packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneInteractor.kt

+4 −0
Original line number Diff line number Diff line
@@ -167,6 +167,10 @@ constructor( 
                initialValue = isVisibleInternal()

            )



    /** Whether there's an ongoing remotely-initiated user interaction. */

    val isRemoteUserInteractionOngoing: StateFlow<Boolean> =

        repository.isRemoteUserInteractionOngoing



    /**

     * The amount of transition into or out of the given [scene].

     *

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+6 −1
Original line number Diff line number Diff line
@@ -1276,7 +1276,7 @@ public class KeyguardIndicationController { 
            mPowerPluggedInWired = status.isPluggedInWired() && isChargingOrFull;

            mPowerPluggedInWireless = status.isPluggedInWireless() && isChargingOrFull;

            mPowerPluggedInDock = status.isPluggedInDock() && isChargingOrFull;

            mPowerPluggedIn = status.isPluggedIn() && isChargingOrFull;

            mPowerPluggedIn = isPowerPluggedIn(status, isChargingOrFull);

            mPowerCharged = status.isCharged();

            mChargingWattage = status.maxChargingWattage;

            mChargingSpeed = status.getChargingSpeed(mContext);
@@ -1562,6 +1562,11 @@ public class KeyguardIndicationController { 
        return status.isBatteryDefender();

    }



    /** Return true if the device has power plugged in. */

    protected boolean isPowerPluggedIn(BatteryStatus status, boolean isChargingOrFull) {

        return status.isPluggedIn() && isChargingOrFull;

    }



    private boolean isCurrentUser(int userId) {

        return getCurrentUser() == userId;

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarTouchableRegionManager.java

+16 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.view.ViewTreeObserver; 
import android.view.ViewTreeObserver.OnComputeInternalInsetsListener;

import android.view.WindowInsets;



import androidx.annotation.VisibleForTesting;

import com.android.compose.animation.scene.ObservableTransitionState;

import com.android.internal.policy.SystemBarUtils;

import com.android.systemui.Dumpable;
@@ -69,6 +70,7 @@ public final class StatusBarTouchableRegionManager implements Dumpable { 


    private boolean mIsStatusBarExpanded = false;

    private boolean mIsIdleOnGone = true;

    private boolean mIsRemoteUserInteractionOngoing = false;

    private boolean mShouldAdjustInsets = false;

    private View mNotificationShadeWindowView;

    private View mNotificationPanelView;
@@ -133,6 +135,9 @@ public final class StatusBarTouchableRegionManager implements Dumpable { 
            javaAdapter.alwaysCollectFlow(

                    sceneInteractor.get().getTransitionState(),

                    this::onSceneChanged);

            javaAdapter.alwaysCollectFlow(

                    sceneInteractor.get().isRemoteUserInteractionOngoing(),

                    this::onRemoteUserInteractionOngoingChanged);

        } else {

            javaAdapter.alwaysCollectFlow(

                    shadeInteractor.isAnyExpanded(),
@@ -179,6 +184,13 @@ public final class StatusBarTouchableRegionManager implements Dumpable { 
        }

    }



    private void onRemoteUserInteractionOngoingChanged(Boolean ongoing) {

        if (ongoing != mIsRemoteUserInteractionOngoing) {

            mIsRemoteUserInteractionOngoing = ongoing;

            updateTouchableRegion();

        }

    }



    /**

     * Calculates the touch region needed for heads up notifications, taking into consideration

     * any existing display cutouts (notch)
@@ -276,13 +288,15 @@ public final class StatusBarTouchableRegionManager implements Dumpable { 
     * Helper to let us know when calculating the region is not needed because we know the entire

     * screen needs to be touchable.

     */

    private boolean shouldMakeEntireScreenTouchable() {

    @VisibleForTesting

    boolean shouldMakeEntireScreenTouchable() {

        // The touchable region is always the full area when expanded, whether we're showing the

        // shade or the bouncer. It's also fully touchable when the screen off animation is playing

        // since we don't want stray touches to go through the light reveal scrim to whatever is

        // underneath.

        return mIsStatusBarExpanded

                || (SceneContainerFlag.isEnabled() && !mIsIdleOnGone)

                || (SceneContainerFlag.isEnabled()

                && (!mIsIdleOnGone || mIsRemoteUserInteractionOngoing))

                || mPrimaryBouncerInteractor.isShowing().getValue()

                || mAlternateBouncerInteractor.isVisibleState()

                || mUnlockedScreenOffAnimationController.isAnimationPlaying();