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

Commit 4ca36d5c authored by lucaslin's avatar lucaslin
Browse files

Replace CM#isNetworkSupported() with checking FEATURE_TELEPHONY 

ConnectivityManager will be a part of mainline module, so its
hidden API cannot be called by external caller.
Replace ConnectivityManager#isNetworkSupported() with
checking FEATURE_TELEPHONY.

Bug: 182963397
Test: m
Change-Id: I457459554e5e6fe0874b8db81c6547035a6603b8
Merged-In: I457459554e5e6fe0874b8db81c6547035a6603b8
parent e1b9b928

services/core/java/com/android/server/timezonedetector/TimeZoneDetectorCallbackImpl.java

+2 −4
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.annotation.Nullable; 
import android.app.AlarmManager;

import android.content.ContentResolver;

import android.content.Context;

import android.net.ConnectivityManager;

import android.content.pm.PackageManager;

import android.os.SystemProperties;

import android.provider.Settings;
@@ -52,9 +52,7 @@ public final class TimeZoneDetectorCallbackImpl implements TimeZoneDetectorStrat 
    }



    private boolean deviceHasTelephonyNetwork() {

        // TODO b/150583524 Avoid the use of a deprecated API.

        return mContext.getSystemService(ConnectivityManager.class)

                .isNetworkSupported(ConnectivityManager.TYPE_MOBILE);

        return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY);

    }



    @Override