Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2696f940 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Replace CM#isNetworkSupported() with checking FEATURE_TELEPHONY" into sc-dev am: 0e726e61 

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

Change-Id: I5469be9a1558593134bdc15b53ace78e91224cbb
parents cd28be71 0e726e61

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

+2 −4
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package com.android.server.timezonedetector; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.Context;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.net.ConnectivityManager;

import android.os.SystemProperties;

import android.util.ArraySet;
@@ -124,9 +124,7 @@ public final class ServiceConfigAccessor { 
     * device.

     */

    public boolean isTelephonyTimeZoneDetectionFeatureSupported() {

        // 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);

    }



    /**