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

Commit 3ed9eb31 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6484097 from 1660de58 to rvc-release

Change-Id: Ieea7b7e0c07e2fe893760504d54e53287099028f
parents 93ae41f0 1660de58
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -774,10 +774,10 @@ public class DeviceStateMonitor extends Handler {
         * These thresholds are taken from the LTE RSRQ defaults in {@link CarrierConfigManager}.
         */
        public static final int[] EUTRAN_RSRQ = new int[] {
            -19,  /* SIGNAL_STRENGTH_POOR */
            -20,  /* SIGNAL_STRENGTH_POOR */
            -17,  /* SIGNAL_STRENGTH_MODERATE */
            -14,  /* SIGNAL_STRENGTH_GOOD */
            -12   /* SIGNAL_STRENGTH_GREAT */
            -11   /* SIGNAL_STRENGTH_GREAT */
        };

        /**
@@ -819,9 +819,9 @@ public class DeviceStateMonitor extends Handler {
         */
        public static final int[] NGRAN_RSRSRQ = new int[] {
            -16, /* SIGNAL_STRENGTH_POOR */
            -11, /* SIGNAL_STRENGTH_MODERATE */
            -12, /* SIGNAL_STRENGTH_MODERATE */
            -9, /* SIGNAL_STRENGTH_GOOD */
            -7  /* SIGNAL_STRENGTH_GREAT */
            -6  /* SIGNAL_STRENGTH_GREAT */
        };

        /**
+2 −2
Original line number Diff line number Diff line
@@ -4905,7 +4905,7 @@ public class DcTracker extends Handler {
            intent.putExtra(INTENT_DATA_STALL_ALARM_EXTRA_TRANSPORT_TYPE, mTransportType);
            SubscriptionManager.putPhoneIdAndSubIdExtra(intent, mPhone.getPhoneId());
            mDataStallAlarmIntent = PendingIntent.getBroadcast(mPhone.getContext(), 0, intent,
                    PendingIntent.FLAG_UPDATE_CURRENT);
                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
            mAlarmManager.set(AlarmManager.ELAPSED_REALTIME,
                    SystemClock.elapsedRealtime() + delayInMs, mDataStallAlarmIntent);
        } else {
@@ -4973,7 +4973,7 @@ public class DcTracker extends Handler {
        Intent intent = new Intent(INTENT_PROVISIONING_APN_ALARM);
        intent.putExtra(PROVISIONING_APN_ALARM_TAG_EXTRA, mProvisioningApnAlarmTag);
        mProvisioningApnAlarmIntent = PendingIntent.getBroadcast(mPhone.getContext(), 0, intent,
                PendingIntent.FLAG_UPDATE_CURRENT);
                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
        mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,
                SystemClock.elapsedRealtime() + delayInMs, mProvisioningApnAlarmIntent);
    }
+2 −2
Original line number Diff line number Diff line
@@ -315,9 +315,9 @@ public class ServiceStateTrackerTest extends TelephonyTest {
        mBundle.putIntArray(CarrierConfigManager.KEY_5G_NR_SSRSRQ_THRESHOLDS_INT_ARRAY,
                new int[] {
                    -16, /* SIGNAL_STRENGTH_POOR */
                    -11, /* SIGNAL_STRENGTH_MODERATE */
                    -12, /* SIGNAL_STRENGTH_MODERATE */
                    -9, /* SIGNAL_STRENGTH_GOOD */
                    -7  /* SIGNAL_STRENGTH_GREAT */
                    -6  /* SIGNAL_STRENGTH_GREAT */
                });
        mBundle.putIntArray(CarrierConfigManager.KEY_5G_NR_SSSINR_THRESHOLDS_INT_ARRAY,
                new int[] {