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

Commit d1b3cd33 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Migrate to best practise to read network state" into main am: 50c7c5e2 am: 4a6dfb93 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3214635



Change-Id: I4f71a5d577e16bbdb9b3a9f1e429bf8a1412a47d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c09faee9 4a6dfb93

core/java/android/util/NtpTrustedTime.java

+13 −5
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.content.Context; 
import android.content.res.Resources;

import android.net.ConnectivityManager;

import android.net.Network;

import android.net.NetworkInfo;

import android.net.NetworkCapabilities;

import android.net.SntpClient;

import android.os.Build;

import android.os.SystemClock;
@@ -687,8 +687,16 @@ public abstract class NtpTrustedTime implements TrustedTime { 
            if (connectivityManager == null) {

                return false;

            }

            final NetworkInfo ni = connectivityManager.getNetworkInfo(network);



            final NetworkCapabilities networkCapabilities =

                    connectivityManager.getNetworkCapabilities(network);

            if (networkCapabilities == null) {

                if (LOGD) Log.d(TAG, "getNetwork: failed to get network capabilities");

                return false;

            }

            final boolean isConnectedToInternet = networkCapabilities.hasCapability(

                    NetworkCapabilities.NET_CAPABILITY_INTERNET)

                    && networkCapabilities.hasCapability(

                    NetworkCapabilities.NET_CAPABILITY_VALIDATED);

            // This connectivity check is to avoid performing a DNS lookup for the time server on a

            // unconnected network. There are races to obtain time in Android when connectivity

            // changes, which means that forceRefresh() can be called by various components before
@@ -698,8 +706,8 @@ public abstract class NtpTrustedTime implements TrustedTime { 
            // A side effect of check is that tests that run a fake NTP server on the device itself

            // will only be able to use it if the active network is connected, even though loopback

            // addresses are actually reachable.

            if (ni == null || !ni.isConnected()) {

                if (LOGD) Log.d(TAG, "getNetwork: no connectivity");

            if (!isConnectedToInternet) {

                if (LOGD) Log.d(TAG, "getNetwork: no internet connectivity");

                return false;

            }

            return true;