Merge cherrypicks of ['googleplex-android-review.googlesource.com/31515393'] into 25Q1-release.
Change-Id: I5ba631b05bbc59dfdb871231ae773eab43e48815
This commit is contained in:
@@ -95,7 +95,13 @@ public class SatelliteSettingPreferenceController extends
|
|||||||
return UNSUPPORTED_ON_DEVICE;
|
return UNSUPPORTED_ON_DEVICE;
|
||||||
}
|
}
|
||||||
|
|
||||||
return mIsCarrierSatelliteAttachSupported ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
|
int availabilityStatus = mIsCarrierSatelliteAttachSupported
|
||||||
|
? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
|
||||||
|
if (availabilityStatus == AVAILABLE && mIsCarrierRoamingNtnConnectedTypeManual
|
||||||
|
&& !mIsSatelliteSmsAvailableForManualType) {
|
||||||
|
availabilityStatus = CONDITIONALLY_UNAVAILABLE;
|
||||||
|
}
|
||||||
|
return availabilityStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user