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

Commit 0a5578f7 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Update internet data state when capabilities change am: 21c9ea90 am: 3c3b596d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2499817



Change-Id: I3fa0eb4e917fdda58599c23b201cec652fe4a09d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bef33d1e 3c3b596d

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

+11 −5
Original line number Diff line number Diff line
@@ -3179,6 +3179,12 @@ public class DataNetworkController extends Handler { 
            log("Found more network requests that can be satisfied. " + networkRequestList);

            dataNetwork.attachNetworkRequests(networkRequestList);

        }



        if (dataNetwork.getNetworkCapabilities().hasCapability(

                NetworkCapabilities.NET_CAPABILITY_INTERNET)) {

            // Update because DataNetwork#isInternetSupported might have changed with capabilities.

            updateOverallInternetDataState();

        }

    }



    /**
@@ -3329,9 +3335,9 @@ public class DataNetworkController extends Handler { 
    }



    /**

     * Update the internet data network state. For now only {@link TelephonyManager#DATA_CONNECTED}

     * , {@link TelephonyManager#DATA_SUSPENDED}, and

     * {@link TelephonyManager#DATA_DISCONNECTED} are supported.

     * Update the internet data network state. For now only {@link TelephonyManager#DATA_CONNECTED},

     * {@link TelephonyManager#DATA_SUSPENDED}, and {@link TelephonyManager#DATA_DISCONNECTED}

     * are supported.

     */

    private void updateOverallInternetDataState() {

        boolean anyInternetConnected = mDataNetworkList.stream()
@@ -3599,8 +3605,8 @@ public class DataNetworkController extends Handler { 


    /**

     * Get the internet data network state. Note that this is the best effort if more than one

     * data network supports internet. For now only {@link TelephonyManager#DATA_CONNECTED}

     * , {@link TelephonyManager#DATA_SUSPENDED}, and {@link TelephonyManager#DATA_DISCONNECTED}

     * data network supports internet. For now only {@link TelephonyManager#DATA_CONNECTED},

     * {@link TelephonyManager#DATA_SUSPENDED}, and {@link TelephonyManager#DATA_DISCONNECTED}

     * are supported.

     *

     * @return The data network state.