commit 9214c04e45559408434a8af724867e4f2e364539
author Lucas Lin <lucaslin@google.com> Wed Mar 24 04:44:17 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 24 04:44:17 2021 +0000
tree ad28f2b1a8ab329e6931205b3c815b63a04dc71b
parent c24bbc64499c3b68a596b99f9c57212d88f81feb
parent ac06b167f9f3d20cdf920f579389b0db0bc88b33

Merge "Replace CM#isNetworkSupported() with checking FEATURE_TELEPHONY" am: ac06b167f9

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

Change-Id: I4a4bb433b565539d33dfeb515a277b0b61a2aa91

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