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

Commit 0d2b68bb authored by Nate Fischer's avatar Nate Fischer Committed by android-build-merger
Browse files

Merge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into... 

Merge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc-mr1-dev am: b2456e61
am: 0cd12a83

Change-Id: I5c0529021e6bbba15090bfc500bb4610a9a4c0d7
parents c967227f 0cd12a83

api/current.txt

+1 −2
Original line number Original line Diff line number Diff line
@@ -49217,7 +49217,6 @@ package android.webkit { 
    method public void goBack();

    method public void goBack();

    method public void goBackOrForward(int);

    method public void goBackOrForward(int);

    method public void goForward();

    method public void goForward();

    method public static void initSafeBrowsing(android.content.Context, android.webkit.ValueCallback<java.lang.Boolean>);

    method public void invokeZoomPicker();

    method public void invokeZoomPicker();

    method public boolean isPrivateBrowsingEnabled();

    method public boolean isPrivateBrowsingEnabled();

    method public void loadData(java.lang.String, java.lang.String, java.lang.String);

    method public void loadData(java.lang.String, java.lang.String, java.lang.String);
@@ -49265,7 +49264,7 @@ package android.webkit { 
    method public void setWebViewClient(android.webkit.WebViewClient);

    method public void setWebViewClient(android.webkit.WebViewClient);

    method public deprecated boolean shouldDelayChildPressedState();

    method public deprecated boolean shouldDelayChildPressedState();

    method public deprecated boolean showFindDialog(java.lang.String, boolean);

    method public deprecated boolean showFindDialog(java.lang.String, boolean);

    method public static void shutdownSafeBrowsing();

    method public static void startSafeBrowsing(android.content.Context, android.webkit.ValueCallback<java.lang.Boolean>);

    method public void stopLoading();

    method public void stopLoading();

    method public void zoomBy(float);

    method public void zoomBy(float);

    method public boolean zoomIn();

    method public boolean zoomIn();

api/system-current.txt

+1 −3
Original line number Original line Diff line number Diff line
@@ -52921,7 +52921,6 @@ package android.webkit { 
    method public void goBack();

    method public void goBack();

    method public void goBackOrForward(int);

    method public void goBackOrForward(int);

    method public void goForward();

    method public void goForward();

    method public static void initSafeBrowsing(android.content.Context, android.webkit.ValueCallback<java.lang.Boolean>);

    method public void invokeZoomPicker();

    method public void invokeZoomPicker();

    method public boolean isPrivateBrowsingEnabled();

    method public boolean isPrivateBrowsingEnabled();

    method public void loadData(java.lang.String, java.lang.String, java.lang.String);

    method public void loadData(java.lang.String, java.lang.String, java.lang.String);
@@ -52969,7 +52968,7 @@ package android.webkit { 
    method public void setWebViewClient(android.webkit.WebViewClient);

    method public void setWebViewClient(android.webkit.WebViewClient);

    method public deprecated boolean shouldDelayChildPressedState();

    method public deprecated boolean shouldDelayChildPressedState();

    method public deprecated boolean showFindDialog(java.lang.String, boolean);

    method public deprecated boolean showFindDialog(java.lang.String, boolean);

    method public static void shutdownSafeBrowsing();

    method public static void startSafeBrowsing(android.content.Context, android.webkit.ValueCallback<java.lang.Boolean>);

    method public void stopLoading();

    method public void stopLoading();

    method public void zoomBy(float);

    method public void zoomBy(float);

    method public boolean zoomIn();

    method public boolean zoomIn();
@@ -53166,7 +53165,6 @@ package android.webkit { 
    method public abstract android.net.Uri[] parseFileChooserResult(int, android.content.Intent);

    method public abstract android.net.Uri[] parseFileChooserResult(int, android.content.Intent);

    method public abstract void setSafeBrowsingWhitelist(java.util.List<java.lang.String>, android.webkit.ValueCallback<java.lang.Boolean>);

    method public abstract void setSafeBrowsingWhitelist(java.util.List<java.lang.String>, android.webkit.ValueCallback<java.lang.Boolean>);

    method public abstract void setWebContentsDebuggingEnabled(boolean);

    method public abstract void setWebContentsDebuggingEnabled(boolean);

    method public abstract void shutdownSafeBrowsing();

  }

  }

















  public class WebViewFragment extends android.app.Fragment {







  public class WebViewFragment extends android.app.Fragment {

























api/test-current.txt



+1
−2




























Original line number
Original line
Diff line number
Diff line








@@ -49682,7 +49682,6 @@ package android.webkit {









    method public void goBack();







    method public void goBack();











    method public void goBackOrForward(int);







    method public void goBackOrForward(int);











    method public void goForward();







    method public void goForward();











    method public static void initSafeBrowsing(android.content.Context, android.webkit.ValueCallback<java.lang.Boolean>);














    method public void invokeZoomPicker();







    method public void invokeZoomPicker();











    method public boolean isPrivateBrowsingEnabled();







    method public boolean isPrivateBrowsingEnabled();











    method public void loadData(java.lang.String, java.lang.String, java.lang.String);







    method public void loadData(java.lang.String, java.lang.String, java.lang.String);










@@ -49730,7 +49729,7 @@ package android.webkit {









    method public void setWebViewClient(android.webkit.WebViewClient);







    method public void setWebViewClient(android.webkit.WebViewClient);











    method public deprecated boolean shouldDelayChildPressedState();







    method public deprecated boolean shouldDelayChildPressedState();











    method public deprecated boolean showFindDialog(java.lang.String, boolean);







    method public deprecated boolean showFindDialog(java.lang.String, boolean);











    method public static void shutdownSafeBrowsing();







    method public static void startSafeBrowsing(android.content.Context, android.webkit.ValueCallback<java.lang.Boolean>);











    method public void stopLoading();







    method public void stopLoading();











    method public void zoomBy(float);







    method public void zoomBy(float);











    method public boolean zoomIn();







    method public boolean zoomIn();

























core/java/android/webkit/WebView.java



+12
−26




























Original line number
Original line
Diff line number
Diff line








@@ -1628,41 +1628,27 @@ public class WebView extends AbsoluteLayout









    }







    }































    /**







    /**











     * Starts Safe Browsing initialization. This should only be called once.







     * Starts Safe Browsing initialization.











     *














     * <p>







     * <p>











     * Because the Safe Browsing feature takes time to initialize, WebView may temporarily whitelist







     * URL loads are not guaranteed to be protected by Safe Browsing until after {@code callback} is











     * URLs until the feature is ready. The callback will be invoked with true once initialization







     * invoked with {@code true}. Safe Browsing is not fully supported on all devices. For those











     * is complete.







     * devices {@code callback} will receive {@code false}.











     * </p>














     *














     * <p>







     * <p>











     * This does not enable the Safe Browsing feature itself, and should only be used if the feature







     * This does not enable the Safe Browsing feature itself, and should only be called if Safe











     * is otherwise enabled.







     * Browsing is enabled by the manifest tag or {@link WebSettings#setSafeBrowsingEnabled}. This











     * </p>







     * prepares resources used for Safe Browsing.











     *














     * <p>







     * <p>











     * This does not require an Activity Context, and will always use the application Context to do







     * This should be called with the Application Context (and will always use the Application











     * its work.







     * context to do its work regardless).











     * </p>














     *







     *











     * @param context Application Context.







     * @param context Application Context.











     * @param callback will be called with the value true if initialization is







     * @param callback will be called on the UI thread with {@code true} if initialization is











     * successful. The callback will be run on the UI thread.







     * successful, {@code false} otherwise.











     */







     */











    public static void initSafeBrowsing(Context context, ValueCallback<Boolean> callback) {







    public static void startSafeBrowsing(Context context, ValueCallback<Boolean> callback) {











        getFactory().getStatics().initSafeBrowsing(context, callback);







        getFactory().getStatics().initSafeBrowsing(context, callback);











    }







    }































    /**














     * Shuts down Safe Browsing. This should only be called once. This does not disable the feature,














     * it only frees resources used by Safe Browsing code. To disable Safe Browsing on an individual














     * WebView, see {@link WebSettings#setSafeBrowsingEnabled}














     */














    public static void shutdownSafeBrowsing() {














        getFactory().getStatics().shutdownSafeBrowsing();














    }





























    /**







    /**











     * Sets the list of domains that are exempt from SafeBrowsing checks. The list is







     * Sets the list of domains that are exempt from SafeBrowsing checks. The list is











     * global for all the WebViews.







     * global for all the WebViews.

































core/java/android/webkit/WebViewFactoryProvider.java



+1
−7




























Original line number
Original line
Diff line number
Diff line








@@ -80,16 +80,10 @@ public interface WebViewFactoryProvider {





























        /**







        /**











         * Implement the API method







         * Implement the API method











         * {@link android.webkit.WebView#initSafeBrowsing(Context , ValueCallback<Boolean>)}







         * {@link android.webkit.WebView#startSafeBrowsing(Context , ValueCallback<Boolean>)}











         */







         */











        void initSafeBrowsing(Context context, ValueCallback<Boolean> callback);







        void initSafeBrowsing(Context context, ValueCallback<Boolean> callback);































        /**














         * Implement the API method














         * {@link android.webkit.WebView#shutdownSafeBrowsing()}














         */














        void shutdownSafeBrowsing();





























        /**







        /**











        * Implement the API method







        * Implement the API method











        * {@link android.webkit.WebView#setSafeBrowsingWhitelist(List<String>,







        * {@link android.webkit.WebView#setSafeBrowsingWhitelist(List<String>,