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

Commit fa9217e7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed NPE when OsAppId is null in traffic descriptor" into tm-dev

parents 2bbec5eb cb5d80f4

src/java/com/android/internal/telephony/data/DataNetwork.java

+2 −4
Original line number Diff line number Diff line
@@ -1559,6 +1559,7 @@ public class DataNetwork extends StateMachine { 
        // Extract network capabilities from the traffic descriptor.

        for (TrafficDescriptor trafficDescriptor : mTrafficDescriptors) {

            try {

                if (trafficDescriptor.getOsAppId() == null) continue;

                OsAppId osAppId = new OsAppId(trafficDescriptor.getOsAppId());

                if (!osAppId.getOsId().equals(OsAppId.ANDROID_OS_ID)) {

                    loge("Received non-Android OS id " + osAppId.getOsId());
@@ -1569,10 +1570,7 @@ public class DataNetwork extends StateMachine { 
                switch (networkCapability) {

                    case NetworkCapabilities.NET_CAPABILITY_ENTERPRISE:

                        builder.addCapability(networkCapability);

                        // Enterprise is the only capability supporting differentiator.

                        if (networkCapability == NetworkCapabilities.NET_CAPABILITY_ENTERPRISE) {

                        builder.addEnterpriseId(osAppId.getDifferentiator());

                        }

                        break;

                    case NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_LATENCY:

                    case NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_BANDWIDTH: