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

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

Snap for 13248265 from ac903221 to 25Q2-release

Change-Id: I84cfaf3f2574b2a5d4afe0618ff0bd658809fcb6
parents 2855286a ac903221
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ message IncomingSms {
    optional bool is_managed_profile = 16;
    optional bool is_ntn = 17;
    optional bool is_emergency = 18;
    optional bool is_nb_iot_ntn = 19;

    // Internal use only
    optional int32 hashCode = 10001;
@@ -379,6 +380,7 @@ message OutgoingSms {
    optional bool is_emergency = 19;
    optional bool is_ntn = 20;
    optional bool is_mt_sms_polling = 21;
    optional bool is_nb_iot_ntn = 22;

    // Internal use only
    optional int32 hashCode = 10001;
@@ -418,6 +420,7 @@ message DataCallSession {
    optional bool is_ntn = 24;
    optional bool is_satellite_transport = 25;
    optional bool is_provisioning_profile = 26;
    optional bool is_nb_iot_ntn = 27;
}

message CellularServiceState {
@@ -437,6 +440,7 @@ message CellularServiceState {
    optional bool isDataEnabled = 14;
    optional bool is_iwlan_cross_sim = 15;
    optional bool is_ntn = 16;
    optional bool is_nb_iot_ntn = 17;

    // Internal use only
    optional int64 last_used_millis = 10001;
@@ -832,6 +836,7 @@ message CarrierRoamingSatelliteSession {
    optional int32 service_data_policy = 18;
    optional int64 satellite_data_consumed_bytes = 19;
    optional bool is_multi_sim = 20;
    optional bool is_nb_iot_ntn = 21;
}

message CarrierRoamingSatelliteControllerStats {
@@ -846,6 +851,7 @@ message CarrierRoamingSatelliteControllerStats {
    optional bool is_device_entitled = 9;
    optional bool is_multi_sim = 10;
    optional int32 count_of_satellite_sessions = 11;
    optional bool is_nb_iot_ntn = 12;
}

message SatelliteEntitlement {
+14 −4
Original line number Diff line number Diff line
@@ -639,7 +639,12 @@ public class AutoDataSwitchController extends Handler {
            int currentScore = mPhonesSignalStatus[preferredPhoneId].getRatSignalScore();
            for (int phoneId = 0; phoneId < mPhonesSignalStatus.length; phoneId++) {
                if (phoneId == preferredPhoneId) continue;
                int candidateScore = mPhonesSignalStatus[phoneId].getRatSignalScore();
                PhoneSignalStatus candidateStatus = mPhonesSignalStatus[phoneId];
                // Ignore non-home phone.
                if (candidateStatus.getUsableState() != PhoneSignalStatus.UsableState.HOME) {
                    continue;
                }
                int candidateScore = candidateStatus.getRatSignalScore();
                if ((candidateScore - currentScore) > mScoreTolerance
                        // Also reevaluate if DDS has the same score as the current phone.
                        || (candidateScore >= currentScore && phoneId == ddsPhoneId)) {
@@ -715,6 +720,7 @@ public class AutoDataSwitchController extends Handler {
                mSelectedTargetPhoneId = INVALID_PHONE_INDEX;
                mPhoneSwitcherCallback.onRequireImmediatelySwitchToPhone(DEFAULT_PHONE_INDEX,
                        EVALUATION_REASON_DATA_SETTINGS_CHANGED);
                cancelAnyPendingSwitch();
                log(debugMessage.append(
                        ", immediately back to default as user turns off default").toString());
                return;
@@ -723,6 +729,7 @@ public class AutoDataSwitchController extends Handler {
                mSelectedTargetPhoneId = INVALID_PHONE_INDEX;
                mPhoneSwitcherCallback.onRequireImmediatelySwitchToPhone(
                        DEFAULT_PHONE_INDEX, EVALUATION_REASON_DATA_SETTINGS_CHANGED);
                cancelAnyPendingSwitch();
                log(debugMessage.append(
                                ", immediately back to default because backup ")
                        .append(internetEvaluation).toString());
@@ -762,7 +769,9 @@ public class AutoDataSwitchController extends Handler {

                    if (isCurrentUsable) {
                        // Both phones are usable.
                        if (isRatSignalStrengthBasedSwitchEnabled()) {
                        if (isRatSignalStrengthBasedSwitchEnabled()
                                && currentUsableState == PhoneSignalStatus.UsableState.HOME
                                && defaultUsableState == PhoneSignalStatus.UsableState.HOME) {
                            int defaultScore = mPhonesSignalStatus[defaultDataPhoneId]
                                    .getRatSignalScore();
                            int currentScore = mPhonesSignalStatus[preferredPhoneId]
@@ -854,8 +863,9 @@ public class AutoDataSwitchController extends Handler {
            if (candidateUsableState.mScore > currentUsableState.mScore) {
                secondaryDataPhone = PhoneFactory.getPhone(phoneId);
            } else if (isRatSignalStrengthBasedSwitchEnabled()
                    && currentUsableState.mScore == candidateUsableState.mScore) {
                // Both phones are home or both roaming enabled, so compare RAT/signal score.
                    && currentUsableState == PhoneSignalStatus.UsableState.HOME
                    && candidateUsableState == PhoneSignalStatus.UsableState.HOME) {
                // Both phones are home, so compare RAT/signal score.

                int defaultScore = defaultPhoneStatus.getRatSignalScore();
                int candidateScore = candidatePhoneStatus.getRatSignalScore();
+8 −2
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ public class DataCallSessionStats {
        copy.isNtn = call.isNtn;
        copy.isSatelliteTransport = call.isSatelliteTransport;
        copy.isProvisioningProfile = call.isProvisioningProfile;
        copy.isNbIotNtn = call.isNbIotNtn;
        return copy;
    }

@@ -337,8 +338,13 @@ public class DataCallSessionStats {
        proto.handoverFailureRat = new int[0];
        proto.isNonDds = false;
        proto.isIwlanCrossSim = false;
        proto.isNtn = mSatelliteController != null
                ? mSatelliteController.isInSatelliteModeForCarrierRoaming(mPhone) : false;
        if (mSatelliteController != null) {
            proto.isNtn = mSatelliteController.isInSatelliteModeForCarrierRoaming(mPhone);
            proto.isNbIotNtn = mSatelliteController.isInCarrierRoamingNbIotNtn(mPhone);
        } else {
            proto.isNtn = false;
            proto.isNbIotNtn = false;
        }
        proto.isSatelliteTransport = isSatellite;
        proto.isProvisioningProfile = getIsProvisioningProfile();
        return proto;
+12 −6
Original line number Diff line number Diff line
@@ -1086,7 +1086,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
                state.overrideVoiceService,
                state.isDataEnabled,
                state.isIwlanCrossSim,
                state.isNtn);
                state.isNtn,
                state.isNbIotNtn);
    }

    private static StatsEvent buildStatsEvent(VoiceCallRatUsage usage) {
@@ -1172,7 +1173,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
                sms.count,
                sms.isManagedProfile,
                sms.isNtn,
                sms.isEmergency);
                sms.isEmergency,
                sms.isNbIotNtn);
    }

    private static StatsEvent buildStatsEvent(OutgoingSms sms) {
@@ -1198,7 +1200,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
                sms.isManagedProfile,
                sms.isEmergency,
                sms.isNtn,
                sms.isMtSmsPolling);
                sms.isMtSmsPolling,
                sms.isNbIotNtn);
    }

    private static StatsEvent buildStatsEvent(DataCallSession dataCallSession) {
@@ -1230,7 +1233,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
                dataCallSession.isIwlanCrossSim,
                dataCallSession.isNtn,
                dataCallSession.isSatelliteTransport,
                dataCallSession.isProvisioningProfile);
                dataCallSession.isProvisioningProfile,
                dataCallSession.isNbIotNtn);
    }

    private static StatsEvent buildStatsEvent(ImsRegistrationStats stats) {
@@ -1603,7 +1607,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
                stats.supportedSatelliteServices,
                stats.serviceDataPolicy,
                stats.satelliteDataConsumedBytes,
                stats.isMultiSim);
                stats.isMultiSim,
                stats.isNbIotNtn);
    }

    private static StatsEvent buildStatsEvent(CarrierRoamingSatelliteControllerStats stats) {
@@ -1619,7 +1624,8 @@ public class MetricsCollector implements StatsManager.StatsPullAtomCallback {
                stats.carrierId,
                stats.isDeviceEntitled,
                stats.isMultiSim,
                stats.countOfSatelliteSessions);
                stats.countOfSatelliteSessions,
                stats.isNbIotNtn);
    }

    private static StatsEvent buildStatsEvent(SatelliteEntitlement stats) {
+4 −4
Original line number Diff line number Diff line
@@ -899,6 +899,7 @@ public class PersistAtomsStorage {
            existingStats.isDeviceEntitled = stats.isDeviceEntitled;
            existingStats.isMultiSim = stats.isMultiSim;
            existingStats.countOfSatelliteSessions += stats.countOfSatelliteSessions;
            existingStats.isNbIotNtn = stats.isNbIotNtn;
        } else {
            mAtoms.carrierRoamingSatelliteControllerStats = insertAtRandomPlace(
                    mAtoms.carrierRoamingSatelliteControllerStats, stats, mMaxNumSatelliteStats);
@@ -2011,7 +2012,8 @@ public class PersistAtomsStorage {
                    && state.overrideVoiceService == key.overrideVoiceService
                    && state.isDataEnabled == key.isDataEnabled
                    && state.isIwlanCrossSim == key.isIwlanCrossSim
                    && state.isNtn == key.isNtn) {
                    && state.isNtn == key.isNtn
                    && state.isNbIotNtn == key.isNbIotNtn) {
                return state;
            }
        }
@@ -2442,9 +2444,7 @@ public class PersistAtomsStorage {
            CarrierRoamingSatelliteControllerStats key) {
        for (CarrierRoamingSatelliteControllerStats stats :
                mAtoms.carrierRoamingSatelliteControllerStats) {
            if (stats.carrierId == key.carrierId
                    && stats.configDataSource == key.configDataSource
                    && stats.isDeviceEntitled == key.isDeviceEntitled) {
            if (stats.carrierId == key.carrierId) {
                return stats;
            }
        }
Loading