Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I9428a5954d7461f6e8ae0e1a28cf9a3ecc4a7859
This commit is contained in:
Lucas Lin
2021-03-24 05:25:35 +00:00
committed by Automerger Merge Worker
parent 8f3e66d300 9214c04e45
commit cc0de009be
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/timezonedetector/TimeZoneDetectorCallbackImpl.java
View File

@@ -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