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

Commit f3ca9477 authored by Yuhao Zheng's avatar Yuhao Zheng Committed by Android (Google) Code Review
Browse files

Merge "New Telephony APIs to return MMS UA and UAProfUrl" into klp-dev

parents 76a5c86d d2078bc8

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -23774,6 +23774,8 @@ package android.telephony { 
    method public java.lang.String getDeviceSoftwareVersion();

    method public java.lang.String getGroupIdLevel1();

    method public java.lang.String getLine1Number();

    method public java.lang.String getMmsUAProfUrl();

    method public java.lang.String getMmsUserAgent();

    method public java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();

    method public java.lang.String getNetworkCountryIso();

    method public java.lang.String getNetworkOperator();

core/res/res/values/config.xml

+6 −0
Original line number Diff line number Diff line
@@ -961,6 +961,12 @@ 
         If false, Content-disposition fragments are ignored -->

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



    <!-- MMS user agent string -->

    <string name="config_mms_user_agent" translatable="false"></string>



    <!-- MMS user agent prolfile url -->

    <string name="config_mms_user_agent_profile_url" translatable="false"></string>



    <!-- National Language Identifier codes for the following two config items.

         (from 3GPP TS 23.038 V9.1.1 Table 6.2.1.2.4.1):

          0  - reserved

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -469,6 +469,8 @@ 
  <java-symbol type="string" name="chooseActivity" />

  <java-symbol type="string" name="config_default_dns_server" />

  <java-symbol type="string" name="config_ethernet_iface_regex" />

  <java-symbol type="string" name="config_mms_user_agent" />

  <java-symbol type="string" name="config_mms_user_agent_profile_url" />

  <java-symbol type="string" name="config_ntpServer" />

  <java-symbol type="string" name="config_tether_apndata" />

  <java-symbol type="string" name="config_useragentprofile_url" />

telephony/java/android/telephony/TelephonyManager.java

+18 −0
Original line number Diff line number Diff line
@@ -1400,4 +1400,22 @@ public class TelephonyManager { 
        } catch (NullPointerException ex) {

        }

    }



    /**

     * Returns the MMS user agent.

     */

    public String getMmsUserAgent() {

        if (mContext == null) return null;

        return mContext.getResources().getString(

                com.android.internal.R.string.config_mms_user_agent);

    }



    /**

     * Returns the MMS user agent profile URL.

     */

    public String getMmsUAProfUrl() {

        if (mContext == null) return null;

        return mContext.getResources().getString(

                com.android.internal.R.string.config_mms_user_agent_profile_url);

    }

}