From 04753506805cd1bf39cbf7c71b8dd99442ee50c4 Mon Sep 17 00:00:00 2001 From: Aishwarya Mallamapti Date: Tue, 11 Jul 2023 21:08:54 +0000 Subject: [PATCH] Block data call If network is a non-terrestrial network, block data requests with NET_CAPABILITY_INTERNET. Bug: 287114765 Test: Flashed build on raven-userdebug and performed basic functionality tests, atest DataNetworkControllerTest#testNonTerrestrialNetworkChanged Change-Id: I76c6b9e357cc3914e77fa5b6c4f1ca3406e441f0 --- .../telephony/NetworkRegistrationInfo.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/telephony/java/android/telephony/NetworkRegistrationInfo.java b/telephony/java/android/telephony/NetworkRegistrationInfo.java index a2fbc951fc0bc..882c277183ba5 100644 --- a/telephony/java/android/telephony/NetworkRegistrationInfo.java +++ b/telephony/java/android/telephony/NetworkRegistrationInfo.java @@ -772,6 +772,18 @@ public final class NetworkRegistrationInfo implements Parcelable { } } + /** + * Convert isNonTerrestrialNetwork to string + * + * @param isNonTerrestrialNetwork boolean indicating whether network is a non-terrestrial + * network + * @return string format of isNonTerrestrialNetwork. + * @hide + */ + public static String isNonTerrestrialNetworkToString(boolean isNonTerrestrialNetwork) { + return isNonTerrestrialNetwork ? "NON-TERRESTRIAL" : "TERRESTRIAL"; + } + @NonNull @Override public String toString() { @@ -797,7 +809,8 @@ public final class NetworkRegistrationInfo implements Parcelable { ? nrStateToString(mNrState) : "****") .append(" rRplmn=").append(mRplmn) .append(" isUsingCarrierAggregation=").append(mIsUsingCarrierAggregation) - .append(" isNonTerrestrialNetwork=").append(mIsNonTerrestrialNetwork) + .append(" isNonTerrestrialNetwork=").append( + isNonTerrestrialNetworkToString(mIsNonTerrestrialNetwork)) .append("}").toString(); }