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

Commit db2403ff authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android Code Review
Browse files

Merge "Add support for UAProf header in HTTP requests"

parents 42c94791 bdb0896b

core/java/android/webkit/FrameLoader.java

+9 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.webkit; 


import android.net.http.EventHandler;

import android.net.http.RequestHandle;

import android.os.Build;

import android.util.Log;

import android.webkit.CacheManager.CacheResult;
@@ -35,6 +36,7 @@ class FrameLoader { 
    private int mCacheMode;

    private String mReferrer;

    private String mContentType;

    private final String mUaprofHeader;



    private static final int URI_PROTOCOL = 0x100;
@@ -57,6 +59,8 @@ class FrameLoader { 
        mMethod = method;

        mCacheMode = WebSettings.LOAD_NORMAL;

        mSettings = settings;

        mUaprofHeader = mListener.getContext().getResources().getString(

                com.android.internal.R.string.config_useragentprofile_url, Build.MODEL);

    }



    public void setReferrer(String ref) {
@@ -356,6 +360,11 @@ class FrameLoader { 
        }

        

        mHeaders.put("User-Agent", mSettings.getUserAgentString());



        // Set the x-wap-profile header

        if (mUaprofHeader != null && mUaprofHeader.length() > 0) {

            mHeaders.put("x-wap-profile", mUaprofHeader);

        }

    }



    /**

core/res/res/values/config.xml

+7 −0
Original line number Diff line number Diff line
@@ -332,4 +332,11 @@ 
    <!-- 2 means give warning -->

    <integer name="config_datause_notification_type">2</integer>



    <!-- The URL that should be sent in an x-wap-profile header with an HTTP request,

         as defined in the Open Mobile Alliance User Agent Profile specification

         OMA-TS-UAProf-V2_0-20060206-A Section 8.1.1.1. If the URL contains a '%s'

         format string then that substring will be replaced with the value of

         Build.MODEL. The format string shall not be escaped. -->

    <string name="config_useragentprofile_url"></string>



</resources>