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

Commit 6e49e9b7 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29558253',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29558253', 'googleplex-android-review.googlesource.com/29550443'] into 24Q4-release.

Change-Id: I89e8501e7a1ce25da51a861634a6d1d9c44e87e8
parents db583422 1964ee07

core/java/android/app/ApplicationStartInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -680,6 +680,7 @@ public final class ApplicationStartInfo implements Parcelable { 
        dest.writeParcelable(mStartIntent, flags);

        dest.writeInt(mLaunchMode);

        dest.writeBoolean(mWasForceStopped);

        dest.writeLong(mMonoticCreationTimeMs);

    }



    /** @hide */

telephony/java/android/telephony/CarrierConfigManager.java

+2 −2
Original line number Diff line number Diff line
@@ -9763,7 +9763,7 @@ public class CarrierConfigManager { 
     * users to switch to using satellite emergency messaging.</li>

     * </ul>

     * <p>

     * The default value is 300 seconds.

     * The default value is 180 seconds.

     */

    @FlaggedApi(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)

    public static final String KEY_SATELLITE_CONNECTION_HYSTERESIS_SEC_INT =
@@ -11257,7 +11257,7 @@ public class CarrierConfigManager { 
                KEY_CARRIER_SUPPORTED_SATELLITE_SERVICES_PER_PROVIDER_BUNDLE,

                PersistableBundle.EMPTY);

        sDefaults.putBoolean(KEY_SATELLITE_ATTACH_SUPPORTED_BOOL, false);

        sDefaults.putInt(KEY_SATELLITE_CONNECTION_HYSTERESIS_SEC_INT, 300);

        sDefaults.putInt(KEY_SATELLITE_CONNECTION_HYSTERESIS_SEC_INT, 180);

        sDefaults.putIntArray(KEY_NTN_LTE_RSRP_THRESHOLDS_INT_ARRAY,

                // Boundaries: [-140 dBm, -44 dBm]

                new int[]{