Merge "Replace CM#isNetworkSupported() with checking FEATURE_TELEPHONY" (ac06b167) · Commits · e / os / android_frameworks_base

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