Merge "Use new NetworkCapability API" into sc-dev (71d776ac) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -889,8 +889,8 @@ public class DataConnection extends StateMachine {
		String dnn = null;
		String osAppId = null;
		if (cp.mApnContext.getApnTypeBitmask() == ApnSetting.TYPE_ENTERPRISE) {
		// TODO(b/181916712): update osAppId to use NetworkCapability API once it's available
		osAppId = ApnSetting.getApnTypesStringFromBitmask(mApnSetting.getApnTypeBitmask());
		osAppId = NetworkCapabilities.getCapabilityCarrierName(
		NetworkCapabilities.NET_CAPABILITY_ENTERPRISE);
		} else {
		dnn = mApnSetting.getApnName();
		}
		@@ -1755,11 +1755,11 @@ public class DataConnection extends StateMachine {
		* @return True if this data connection supports enterprise use.
		*/
		private boolean isEnterpriseUse() {
		// TODO(b/181916712): update osAppId to use NetworkCapability API once it's available
		boolean enterpriseTrafficDescriptor = mTrafficDescriptors
		.stream()
		.anyMatch(td -> td.getOsAppId() != null && td.getOsAppId().equals(
		ApnSetting.TYPE_ENTERPRISE_STRING));
		NetworkCapabilities.getCapabilityCarrierName(
		NetworkCapabilities.NET_CAPABILITY_ENTERPRISE)));
		boolean enterpriseApnContext = mApnContexts.keySet()
		.stream()
		.anyMatch(ac -> ac.getApnTypeBitmask() == ApnSetting.TYPE_ENTERPRISE);

+1 −1

Original line number	Diff line number	Diff line
		@@ -1219,7 +1219,7 @@ public class DcTrackerTest extends TelephonyTest {
		eq(DataService.REQUEST_REASON_NORMAL), any(), anyInt(), any(), tdCaptor.capture(),
		anyBoolean(), any(Message.class));
		assertEquals(null, tdCaptor.getValue().getDataNetworkName());
		assertTrue(tdCaptor.getValue().getOsAppId().contains(ApnSetting.TYPE_ENTERPRISE_STRING));
		assertTrue(tdCaptor.getValue().getOsAppId().equals("ENTERPRISE"));
		}

		@Test