commit ac06b167f9f3d20cdf920f579389b0db0bc88b33
author Lucas Lin <lucaslin@google.com> Wed Mar 24 04:02:56 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 24 04:02:56 2021 +0000
tree ad28f2b1a8ab329e6931205b3c815b63a04dc71b
parent b2d5ab569cadfb1b200c0bce166a0c59bb404250
parent 4ca36d5cf37c22ce4be371e1ed6e5c8ac737c4ce

Merge "Replace CM#isNetworkSupported() with checking FEATURE_TELEPHONY"

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

diff --git a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorCallbackImpl.java b/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorCallbackImpl.java
index 3519465..85d2d39 100644
--- a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorCallbackImpl.java
+++ b/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorCallbackImpl.java
@@ -20,7 +20,7 @@
 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 @@
     }
 
     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