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

Commit 7e2e50ce authored by Tim Volodine's avatar Tim Volodine Committed by android-build-merger
Browse files

Merge "[WebView] Add documentation regarding geolocation api on secure origins." into nyc-dev 

am: c750474f

* commit 'c750474f':
  [WebView] Add documentation regarding geolocation api on secure origins.

Change-Id: I785e311619de1d3893f4c1a175f58281e0d02d02
parents c2cd9cca c750474f

core/java/android/webkit/WebChromeClient.java

+7 −0
Original line number Diff line number Diff line
@@ -284,6 +284,13 @@ public class WebChromeClient { 
     * currently set for that origin. The host application should invoke the

     * specified callback with the desired permission state. See

     * {@link GeolocationPermissions} for details.

     *

     * <p>Note that for applications targeting Android N and later SDKs

     * (API level > {@link android.os.Build.VERSION_CODES#M})

     * this method is only called for requests originating from secure

     * origins such as https. On non-secure origins geolocation requests

     * are automatically denied.</p>

     *

     * @param origin The origin of the web content attempting to use the

     *               Geolocation API.

     * @param callback The callback to use to set the permission state for the

core/java/android/webkit/WebView.java

+10 −0
Original line number Diff line number Diff line
@@ -255,6 +255,16 @@ import java.util.Map; 
 * is loading.

 * </p>

 *

 * <h3>HTML5 Geolocation API support</h3>

 *

 * <p>For applications targeting Android N and later releases

 * (API level > {@link android.os.Build.VERSION_CODES#M}) the geolocation api is only supported on

 * secure origins such as https. For such applications requests to geolocation api on non-secure

 * origins are automatically denied without invoking the corresponding

 * {@link WebChromeClient#onGeolocationPermissionsShowPrompt(String, GeolocationPermissions.Callback)}

 * method.

 * </p>

 *

 * <h3>Layout size</h3>

 * <p>

 * It is recommended to set the WebView layout height to a fixed value or to