commit 4ca36d5cf37c22ce4be371e1ed6e5c8ac737c4ce
author lucaslin <lucaslin@google.com> Tue Mar 23 18:07:24 2021 +0800
committer lucaslin <lucaslin@google.com> Tue Mar 23 18:07:24 2021 +0800
tree 52353547225f2c4cd35f2cac328ffc652b4588e2
parent e1b9b92816da866ac27d1eee566a3df89522f59c

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

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