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

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

Merge "Revert "Migrate to best practise to read network state"" into main am:... 

Merge "Revert "Migrate to best practise to read network state"" into main am: 634811f5 am: 24ac7d34

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



Change-Id: Ib35a10e3f833bfac7ef67b809d9f3adedf8757ad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14287520 24ac7d34

core/java/android/util/NtpTrustedTime.java

+5 −13
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.NetworkCapabilities;

import android.net.NetworkInfo;

import android.net.SntpClient;

import android.os.Build;

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

                return false;

            }

            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);

            final NetworkInfo ni = connectivityManager.getNetworkInfo(network);



            // 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
@@ -706,8 +698,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 (!isConnectedToInternet) {

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

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

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

                return false;

            }

            return true;