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

Commit e9a4f023 authored by Daniel Bright's avatar Daniel Bright Committed by Android (Google) Code Review
Browse files

Merge "Changed ApnSetting mappings to constants"

parents cec4ff99 d47f1c43

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -12039,7 +12039,6 @@ package android.content.pm { 
    field public static final String FEATURE_STRONGBOX_KEYSTORE = "android.hardware.strongbox_keystore";

    field public static final String FEATURE_TELEPHONY = "android.hardware.telephony";

    field public static final String FEATURE_TELEPHONY_CDMA = "android.hardware.telephony.cdma";

    field public static final String FEATURE_TELEPHONY_DATA = "android.hardware.telephony.data";

    field public static final String FEATURE_TELEPHONY_EUICC = "android.hardware.telephony.euicc";

    field public static final String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";

    field public static final String FEATURE_TELEPHONY_IMS = "android.hardware.telephony.ims";

core/java/android/content/pm/PackageManager.java

+0 −7
Original line number Diff line number Diff line
@@ -2322,13 +2322,6 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: The device

     * has a telephony radio that support data.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_TELEPHONY_DATA = "android.hardware.telephony.data";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:

     * The device supports telephony carrier restriction mechanism.

core/res/res/values/config.xml

+10 −0
Original line number Diff line number Diff line
@@ -281,6 +281,10 @@ 
         before automatically restore the default connection.  Set -1 if the connection

         does not require auto-restore. -->

    <!-- the 6th element indicates boot-time dependency-met value. -->

    <!-- NOTE: The telephony module is no longer reading the configuration below for available

         APN types.  The set of APN types and relevant settings are specified within the telephony

         module and are non-configurable.  Whether or not data connectivity over a cellular network

         is available at all is controlled by the flag: config_moble_data_capable. -->

    <string-array translatable="false" name="networkAttributes">

        <item>"wifi,1,1,1,-1,true"</item>

        <item>"mobile,0,0,0,-1,true"</item>
@@ -1867,6 +1871,12 @@ 
         Note: This config is deprecated, please use config_defaultSms instead. -->

    <string name="default_sms_application" translatable="false">com.android.messaging</string>



    <!-- Flag indicating whether the current device allows data.

         If true, this means that the device supports data connectivity through

         the telephony network.

         This can be overridden to false for devices that support voice and/or sms . -->

    <bool name="config_mobile_data_capable">true</bool>



    <!-- Default web browser.  This is the package name of the application that will

         be the default browser when the device first boots.  Afterwards the user

         can select whatever browser app they wish to use as the default.

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ 
  <java-symbol type="bool" name="config_sip_wifi_only" />

  <java-symbol type="bool" name="config_sms_capable" />

  <java-symbol type="bool" name="config_sms_utf8_support" />

  <java-symbol type="bool" name="config_mobile_data_capable" />

  <java-symbol type="bool" name="config_suspendWhenScreenOffDueToProximity" />

  <java-symbol type="bool" name="config_swipeDisambiguation" />

  <java-symbol type="bool" name="config_syncstorageengine_masterSyncAutomatically" />

telephony/java/android/telephony/TelephonyManager.java

+2 −3
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import android.compat.annotation.UnsupportedAppUsage; 
import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.database.Cursor;

import android.net.ConnectivityManager;

import android.net.NetworkStats;
@@ -11103,8 +11102,8 @@ public class TelephonyManager { 
     */

    public boolean isDataCapable() {

        if (mContext == null) return true;

        return mContext.getPackageManager().hasSystemFeature(

                PackageManager.FEATURE_TELEPHONY_DATA);

        return mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_mobile_data_capable);

    }



    /**