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

Commit b5c7aac8 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Fixed few more warnings" into main

parents d8c7603a 69b1e0b1

src/java/com/android/internal/telephony/Phone.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -4915,7 +4915,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    /**

    /**

     * @return The data network controller

     * @return The data network controller

     */

     */

    public @Nullable DataNetworkController getDataNetworkController() {

    public @NonNull DataNetworkController getDataNetworkController() {

        return mDataNetworkController;

        return mDataNetworkController;

    }

    }

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

+19 −12
Original line number Original line Diff line number Diff line
@@ -148,7 +148,9 @@ public class AccessNetworksManager extends Handler { 
        @ApnType

        @ApnType

        public final int apnType;

        public final int apnType;

        // The qualified networks in preferred order. Each network is a AccessNetworkType.

        // The qualified networks in preferred order. Each network is a AccessNetworkType.

        public final @NonNull @RadioAccessNetworkType int[] qualifiedNetworks;

        @NonNull

        @RadioAccessNetworkType

        public final int[] qualifiedNetworks;

        public QualifiedNetworks(@ApnType int apnType, @NonNull int[] qualifiedNetworks) {

        public QualifiedNetworks(@ApnType int apnType, @NonNull int[] qualifiedNetworks) {

            this.apnType = apnType;

            this.apnType = apnType;

            this.qualifiedNetworks = Arrays.stream(qualifiedNetworks)

            this.qualifiedNetworks = Arrays.stream(qualifiedNetworks)
@@ -313,7 +315,7 @@ public class AccessNetworksManager extends Handler { 




        /**

        /**

         * Called when QualifiedNetworksService requests network validation.

         * Called when QualifiedNetworksService requests network validation.

         *

         * <p>

         * Since the data network in the connected state corresponding to the given network

         * Since the data network in the connected state corresponding to the given network

         * capability must be validated, a request is tossed to the data network controller.

         * capability must be validated, a request is tossed to the data network controller.

         * @param networkCapability network capability

         * @param networkCapability network capability
@@ -429,7 +431,8 @@ public class AccessNetworksManager extends Handler { 
            mPhone.getDataNetworkController().getDataRetryManager().registerCallback(

            mPhone.getDataNetworkController().getDataRetryManager().registerCallback(

                    new DataRetryManager.DataRetryManagerCallback(this::post) {

                    new DataRetryManager.DataRetryManagerCallback(this::post) {

                        @Override

                        @Override

                        public void onThrottleStatusChanged(List<ThrottleStatus> throttleStatuses) {

                        public void onThrottleStatusChanged(

                                @NonNull List<ThrottleStatus> throttleStatuses) {

                            try {

                            try {

                                logl("onThrottleStatusChanged: " + throttleStatuses);

                                logl("onThrottleStatusChanged: " + throttleStatuses);

                                if (mIQualifiedNetworksService != null) {

                                if (mIQualifiedNetworksService != null) {
@@ -471,7 +474,7 @@ public class AccessNetworksManager extends Handler { 
     */

     */

    private void bindQualifiedNetworksService() {

    private void bindQualifiedNetworksService() {

        post(() -> {

        post(() -> {

            Intent intent = null;

            Intent intent;

            String packageName = getQualifiedNetworksServicePackageName();

            String packageName = getQualifiedNetworksServicePackageName();

            String className = getQualifiedNetworksServiceClassName();

            String className = getQualifiedNetworksServiceClassName();
@@ -538,7 +541,7 @@ public class AccessNetworksManager extends Handler { 
            b = mCarrierConfigManager.getConfigForSubId(mPhone.getSubId(),

            b = mCarrierConfigManager.getConfigForSubId(mPhone.getSubId(),

                    CarrierConfigManager

                    CarrierConfigManager

                            .KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING);

                            .KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING);

            if (b != null && !b.isEmpty()) {

            if (!b.isEmpty()) {

                // If carrier config overrides it, use the one from carrier config

                // If carrier config overrides it, use the one from carrier config

                String carrierConfigPackageName = b.getString(CarrierConfigManager

                String carrierConfigPackageName = b.getString(CarrierConfigManager

                        .KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING);

                        .KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING);
@@ -569,7 +572,7 @@ public class AccessNetworksManager extends Handler { 
            b = mCarrierConfigManager.getConfigForSubId(mPhone.getSubId(),

            b = mCarrierConfigManager.getConfigForSubId(mPhone.getSubId(),

                    CarrierConfigManager

                    CarrierConfigManager

                            .KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_CLASS_OVERRIDE_STRING);

                            .KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_CLASS_OVERRIDE_STRING);

            if (b != null && !b.isEmpty()) {

            if (!b.isEmpty()) {

                // If carrier config overrides it, use the one from carrier config

                // If carrier config overrides it, use the one from carrier config

                String carrierConfigClassName = b.getString(CarrierConfigManager

                String carrierConfigClassName = b.getString(CarrierConfigManager

                        .KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_CLASS_OVERRIDE_STRING);

                        .KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_CLASS_OVERRIDE_STRING);
@@ -585,7 +588,8 @@ public class AccessNetworksManager extends Handler { 
        return className;

        return className;

    }

    }





    private @NonNull List<QualifiedNetworks> getQualifiedNetworksList() {

    @NonNull

    private List<QualifiedNetworks> getQualifiedNetworksList() {

        List<QualifiedNetworks> qualifiedNetworksList = new ArrayList<>();

        List<QualifiedNetworks> qualifiedNetworksList = new ArrayList<>();

        for (int i = 0; i < mAvailableNetworks.size(); i++) {

        for (int i = 0; i < mAvailableNetworks.size(); i++) {

            qualifiedNetworksList.add(new QualifiedNetworks(mAvailableNetworks.keyAt(i),

            qualifiedNetworksList.add(new QualifiedNetworks(mAvailableNetworks.keyAt(i),
@@ -617,11 +621,13 @@ public class AccessNetworksManager extends Handler { 
    /**

    /**

     * @return The available transports.

     * @return The available transports.

     */

     */

    public @NonNull int[] getAvailableTransports() {

    @NonNull

    public int[] getAvailableTransports() {

        return mAvailableTransports;

        return mAvailableTransports;

    }

    }





    private static @TransportType int getTransportFromAccessNetwork(int accessNetwork) {

    @TransportType

    private static int getTransportFromAccessNetwork(int accessNetwork) {

        return accessNetwork == AccessNetworkType.IWLAN

        return accessNetwork == AccessNetworkType.IWLAN

                ? AccessNetworkConstants.TRANSPORT_TYPE_WLAN

                ? AccessNetworkConstants.TRANSPORT_TYPE_WLAN

                : AccessNetworkConstants.TRANSPORT_TYPE_WWAN;

                : AccessNetworkConstants.TRANSPORT_TYPE_WWAN;
@@ -654,7 +660,8 @@ public class AccessNetworksManager extends Handler { 
     * @param apnType APN type

     * @param apnType APN type

     * @return The preferred transport.

     * @return The preferred transport.

     */

     */

    public @TransportType int getPreferredTransport(@ApnType int apnType) {

    @TransportType

    public int getPreferredTransport(@ApnType int apnType) {

        return mPreferredTransports.get(apnType) == null

        return mPreferredTransports.get(apnType) == null

                ? AccessNetworkConstants.TRANSPORT_TYPE_WWAN : mPreferredTransports.get(apnType);

                ? AccessNetworkConstants.TRANSPORT_TYPE_WWAN : mPreferredTransports.get(apnType);

    }

    }
@@ -666,8 +673,8 @@ public class AccessNetworksManager extends Handler { 
     * supported.)

     * supported.)

     * @return The preferred transport.

     * @return The preferred transport.

     */

     */

    public @TransportType int getPreferredTransportByNetworkCapability(

    @TransportType

            @NetCapability int networkCapability) {

    public int getPreferredTransportByNetworkCapability(@NetCapability int networkCapability) {

        int apnType = DataUtils.networkCapabilityToApnType(networkCapability);

        int apnType = DataUtils.networkCapabilityToApnType(networkCapability);

        // For non-APN type capabilities, always route to WWAN.

        // For non-APN type capabilities, always route to WWAN.

        if (apnType == ApnSetting.TYPE_NONE) {

        if (apnType == ApnSetting.TYPE_NONE) {

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

+133 −107

File changed.

Preview size limit exceeded, changes collapsed.

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

+12 −8

File changed.

Preview size limit exceeded, changes collapsed.

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

+136 −72

File changed.

Preview size limit exceeded, changes collapsed.