diff options
| -rw-r--r-- | core/java/android/webkit/WebView.java | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 6711a6b05ff1..aa77d5ea170b 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -299,7 +299,6 @@ public class WebView extends AbsoluteLayout "android.webkit.DATA_REDUCTION_PROXY_SETTING_CHANGED"; private static final String LOGTAG = "WebView"; - private static final boolean TRACE = false; // Throwing an exception for incorrect thread usage if the // build target is JB MR2 or newer. Defaults to false, and is @@ -599,7 +598,6 @@ public class WebView extends AbsoluteLayout sEnforceThreadChecking = context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.JELLY_BEAN_MR2; checkThread(); - if (TRACE) Log.d(LOGTAG, "WebView<init>"); ensureProviderCreated(); mProvider.init(javaScriptInterfaces, privateBrowsing); @@ -614,7 +612,6 @@ public class WebView extends AbsoluteLayout */ public void setHorizontalScrollbarOverlay(boolean overlay) { checkThread(); - if (TRACE) Log.d(LOGTAG, "setHorizontalScrollbarOverlay=" + overlay); mProvider.setHorizontalScrollbarOverlay(overlay); } @@ -625,7 +622,6 @@ public class WebView extends AbsoluteLayout */ public void setVerticalScrollbarOverlay(boolean overlay) { checkThread(); - if (TRACE) Log.d(LOGTAG, "setVerticalScrollbarOverlay=" + overlay); mProvider.setVerticalScrollbarOverlay(overlay); } @@ -680,7 +676,6 @@ public class WebView extends AbsoluteLayout @Deprecated public void setCertificate(SslCertificate certificate) { checkThread(); - if (TRACE) Log.d(LOGTAG, "setCertificate=" + certificate); mProvider.setCertificate(certificate); } @@ -704,7 +699,6 @@ public class WebView extends AbsoluteLayout @Deprecated public void savePassword(String host, String username, String password) { checkThread(); - if (TRACE) Log.d(LOGTAG, "savePassword=" + host); mProvider.savePassword(host, username, password); } @@ -724,7 +718,6 @@ public class WebView extends AbsoluteLayout public void setHttpAuthUsernamePassword(String host, String realm, String username, String password) { checkThread(); - if (TRACE) Log.d(LOGTAG, "setHttpAuthUsernamePassword=" + host); mProvider.setHttpAuthUsernamePassword(host, realm, username, password); } @@ -754,7 +747,6 @@ public class WebView extends AbsoluteLayout */ public void destroy() { checkThread(); - if (TRACE) Log.d(LOGTAG, "destroy"); mProvider.destroy(); } @@ -800,7 +792,6 @@ public class WebView extends AbsoluteLayout */ public void setNetworkAvailable(boolean networkUp) { checkThread(); - if (TRACE) Log.d(LOGTAG, "setNetworkAvailable=" + networkUp); mProvider.setNetworkAvailable(networkUp); } @@ -817,7 +808,6 @@ public class WebView extends AbsoluteLayout */ public WebBackForwardList saveState(Bundle outState) { checkThread(); - if (TRACE) Log.d(LOGTAG, "saveState"); return mProvider.saveState(outState); } @@ -834,7 +824,6 @@ public class WebView extends AbsoluteLayout @Deprecated public boolean savePicture(Bundle b, final File dest) { checkThread(); - if (TRACE) Log.d(LOGTAG, "savePicture=" + dest.getName()); return mProvider.savePicture(b, dest); } @@ -852,7 +841,6 @@ public class WebView extends AbsoluteLayout @Deprecated public boolean restorePicture(Bundle b, File src) { checkThread(); - if (TRACE) Log.d(LOGTAG, "restorePicture=" + src.getName()); return mProvider.restorePicture(b, src); } @@ -870,7 +858,6 @@ public class WebView extends AbsoluteLayout */ public WebBackForwardList restoreState(Bundle inState) { checkThread(); - if (TRACE) Log.d(LOGTAG, "restoreState"); return mProvider.restoreState(inState); } @@ -887,15 +874,6 @@ public class WebView extends AbsoluteLayout */ public void loadUrl(String url, Map<String, String> additionalHttpHeaders) { checkThread(); - if (TRACE) { - StringBuilder headers = new StringBuilder(); - if (additionalHttpHeaders != null) { - for (Map.Entry<String, String> entry : additionalHttpHeaders.entrySet()) { - headers.append(entry.getKey() + ":" + entry.getValue() + "\n"); - } - } - Log.d(LOGTAG, "loadUrl(extra headers)=" + url + "\n" + headers); - } mProvider.loadUrl(url, additionalHttpHeaders); } @@ -906,7 +884,6 @@ public class WebView extends AbsoluteLayout */ public void loadUrl(String url) { checkThread(); - if (TRACE) Log.d(LOGTAG, "loadUrl=" + url); mProvider.loadUrl(url); } @@ -921,7 +898,6 @@ public class WebView extends AbsoluteLayout */ public void postUrl(String url, byte[] postData) { checkThread(); - if (TRACE) Log.d(LOGTAG, "postUrl=" + url); if (URLUtil.isNetworkUrl(url)) { mProvider.postUrl(url, postData); } else { @@ -960,7 +936,6 @@ public class WebView extends AbsoluteLayout */ public void loadData(String data, String mimeType, String encoding) { checkThread(); - if (TRACE) Log.d(LOGTAG, "loadData"); mProvider.loadData(data, mimeType, encoding); } @@ -993,7 +968,6 @@ public class WebView extends AbsoluteLayout public void loadDataWithBaseURL(String baseUrl, String data, String mimeType, String encoding, String historyUrl) { checkThread(); - if (TRACE) Log.d(LOGTAG, "loadDataWithBaseURL=" + baseUrl); mProvider.loadDataWithBaseURL(baseUrl, data, mimeType, encoding, historyUrl); } @@ -1010,7 +984,6 @@ public class WebView extends AbsoluteLayout */ public void evaluateJavascript(String script, ValueCallback<String> resultCallback) { checkThread(); - if (TRACE) Log.d(LOGTAG, "evaluateJavascript=" + script); mProvider.evaluateJavaScript(script, resultCallback); } @@ -1021,7 +994,6 @@ public class WebView extends AbsoluteLayout */ public void saveWebArchive(String filename) { checkThread(); - if (TRACE) Log.d(LOGTAG, "saveWebArchive=" + filename); mProvider.saveWebArchive(filename); } @@ -1039,7 +1011,6 @@ public class WebView extends AbsoluteLayout */ public void saveWebArchive(String basename, boolean autoname, ValueCallback<String> callback) { checkThread(); - if (TRACE) Log.d(LOGTAG, "saveWebArchive(auto)=" + basename); mProvider.saveWebArchive(basename, autoname, callback); } @@ -1048,7 +1019,6 @@ public class WebView extends AbsoluteLayout */ public void stopLoading() { checkThread(); - if (TRACE) Log.d(LOGTAG, "stopLoading"); mProvider.stopLoading(); } @@ -1057,7 +1027,6 @@ public class WebView extends AbsoluteLayout */ public void reload() { checkThread(); - if (TRACE) Log.d(LOGTAG, "reload"); mProvider.reload(); } @@ -1076,7 +1045,6 @@ public class WebView extends AbsoluteLayout */ public void goBack() { checkThread(); - if (TRACE) Log.d(LOGTAG, "goBack"); mProvider.goBack(); } @@ -1095,7 +1063,6 @@ public class WebView extends AbsoluteLayout */ public void goForward() { checkThread(); - if (TRACE) Log.d(LOGTAG, "goForward"); mProvider.goForward(); } @@ -1121,7 +1088,6 @@ public class WebView extends AbsoluteLayout */ public void goBackOrForward(int steps) { checkThread(); - if (TRACE) Log.d(LOGTAG, "goBackOrForwad=" + steps); mProvider.goBackOrForward(steps); } @@ -1141,7 +1107,6 @@ public class WebView extends AbsoluteLayout */ public boolean pageUp(boolean top) { checkThread(); - if (TRACE) Log.d(LOGTAG, "pageUp"); return mProvider.pageUp(top); } @@ -1153,7 +1118,6 @@ public class WebView extends AbsoluteLayout */ public boolean pageDown(boolean bottom) { checkThread(); - if (TRACE) Log.d(LOGTAG, "pageDown"); return mProvider.pageDown(bottom); } @@ -1207,7 +1171,6 @@ public class WebView extends AbsoluteLayout */ public void insertVisualStateCallback(long requestId, VisualStateCallback callback) { checkThread(); - if (TRACE) Log.d(LOGTAG, "insertVisualStateCallback"); mProvider.insertVisualStateCallback(requestId, callback); } @@ -1220,7 +1183,6 @@ public class WebView extends AbsoluteLayout @Deprecated public void clearView() { checkThread(); - if (TRACE) Log.d(LOGTAG, "clearView"); mProvider.clearView(); } @@ -1251,7 +1213,6 @@ public class WebView extends AbsoluteLayout @Deprecated public Picture capturePicture() { checkThread(); - if (TRACE) Log.d(LOGTAG, "capturePicture"); return mProvider.capturePicture(); } @@ -1262,7 +1223,6 @@ public class WebView extends AbsoluteLayout @Deprecated public PrintDocumentAdapter createPrintDocumentAdapter() { checkThread(); - if (TRACE) Log.d(LOGTAG, "createPrintDocumentAdapter"); return mProvider.createPrintDocumentAdapter("default"); } @@ -1281,7 +1241,6 @@ public class WebView extends AbsoluteLayout */ public PrintDocumentAdapter createPrintDocumentAdapter(String documentName) { checkThread(); - if (TRACE) Log.d(LOGTAG, "createPrintDocumentAdapter"); return mProvider.createPrintDocumentAdapter(documentName); } @@ -1321,7 +1280,6 @@ public class WebView extends AbsoluteLayout */ public void setInitialScale(int scaleInPercent) { checkThread(); - if (TRACE) Log.d(LOGTAG, "setInitialScale=" + scaleInPercent); mProvider.setInitialScale(scaleInPercent); } @@ -1332,7 +1290,6 @@ public class WebView extends AbsoluteLayout */ public void invokeZoomPicker() { checkThread(); - if (TRACE) Log.d(LOGTAG, "invokeZoomPicker"); mProvider.invokeZoomPicker(); } @@ -1356,7 +1313,6 @@ public class WebView extends AbsoluteLayout */ public HitTestResult getHitTestResult() { checkThread(); - if (TRACE) Log.d(LOGTAG, "getHitTestResult"); return mProvider.getHitTestResult(); } @@ -1375,7 +1331,6 @@ public class WebView extends AbsoluteLayout */ public void requestFocusNodeHref(Message hrefMsg) { checkThread(); - if (TRACE) Log.d(LOGTAG, "requestFocusNodeHref"); mProvider.requestFocusNodeHref(hrefMsg); } @@ -1388,7 +1343,6 @@ public class WebView extends AbsoluteLayout */ public void requestImageRef(Message msg) { checkThread(); - if (TRACE) Log.d(LOGTAG, "requestImageRef"); mProvider.requestImageRef(msg); } @@ -1493,7 +1447,6 @@ public class WebView extends AbsoluteLayout */ public void pauseTimers() { checkThread(); - if (TRACE) Log.d(LOGTAG, "pauseTimers"); mProvider.pauseTimers(); } @@ -1503,7 +1456,6 @@ public class WebView extends AbsoluteLayout */ public void resumeTimers() { checkThread(); - if (TRACE) Log.d(LOGTAG, "resumeTimers"); mProvider.resumeTimers(); } @@ -1516,7 +1468,6 @@ public class WebView extends AbsoluteLayout */ public void onPause() { checkThread(); - if (TRACE) Log.d(LOGTAG, "onPause"); mProvider.onPause(); } @@ -1525,7 +1476,6 @@ public class WebView extends AbsoluteLayout */ public void onResume() { checkThread(); - if (TRACE) Log.d(LOGTAG, "onResume"); mProvider.onResume(); } @@ -1548,7 +1498,6 @@ public class WebView extends AbsoluteLayout @Deprecated public void freeMemory() { checkThread(); - if (TRACE) Log.d(LOGTAG, "freeMemory"); mProvider.freeMemory(); } @@ -1560,7 +1509,6 @@ public class WebView extends AbsoluteLayout */ public void clearCache(boolean includeDiskFiles) { checkThread(); - if (TRACE) Log.d(LOGTAG, "clearCache"); mProvider.clearCache(includeDiskFiles); } @@ -1572,7 +1520,6 @@ public class WebView extends AbsoluteLayout */ public void clearFormData() { checkThread(); - if (TRACE) Log.d(LOGTAG, "clearFormData"); mProvider.clearFormData(); } @@ -1581,7 +1528,6 @@ public class WebView extends AbsoluteLayout */ public void clearHistory() { checkThread(); - if (TRACE) Log.d(LOGTAG, "clearHistory"); mProvider.clearHistory(); } @@ -1591,7 +1537,6 @@ public class WebView extends AbsoluteLayout */ public void clearSslPreferences() { checkThread(); - if (TRACE) Log.d(LOGTAG, "clearSslPreferences"); mProvider.clearSslPreferences(); } @@ -1607,7 +1552,6 @@ public class WebView extends AbsoluteLayout * callback. The runnable will be called in UI thread. */ public static void clearClientCertPreferences(Runnable onCleared) { - if (TRACE) Log.d(LOGTAG, "clearClientCertPreferences"); getFactory().getStatics().clearClientCertPreferences(onCleared); } @@ -1649,7 +1593,6 @@ public class WebView extends AbsoluteLayout */ public void findNext(boolean forward) { checkThread(); - if (TRACE) Log.d(LOGTAG, "findNext"); mProvider.findNext(forward); } @@ -1665,7 +1608,6 @@ public class WebView extends AbsoluteLayout @Deprecated public int findAll(String find) { checkThread(); - if (TRACE) Log.d(LOGTAG, "findAll"); StrictMode.noteSlowCall("findAll blocks UI: prefer findAllAsync"); return mProvider.findAll(find); } @@ -1680,7 +1622,6 @@ public class WebView extends AbsoluteLayout */ public void findAllAsync(String find) { checkThread(); - if (TRACE) Log.d(LOGTAG, "findAllAsync"); mProvider.findAllAsync(find); } @@ -1701,7 +1642,6 @@ public class WebView extends AbsoluteLayout @Deprecated public boolean showFindDialog(String text, boolean showIme) { checkThread(); - if (TRACE) Log.d(LOGTAG, "showFindDialog"); return mProvider.showFindDialog(text, showIme); } @@ -1758,7 +1698,6 @@ public class WebView extends AbsoluteLayout */ public void clearMatches() { checkThread(); - if (TRACE) Log.d(LOGTAG, "clearMatches"); mProvider.clearMatches(); } @@ -1819,7 +1758,6 @@ public class WebView extends AbsoluteLayout @Deprecated public void setPictureListener(PictureListener listener) { checkThread(); - if (TRACE) Log.d(LOGTAG, "setPictureListener=" + listener); mProvider.setPictureListener(listener); } @@ -1876,7 +1814,6 @@ public class WebView extends AbsoluteLayout */ public void addJavascriptInterface(Object object, String name) { checkThread(); - if (TRACE) Log.d(LOGTAG, "addJavascriptInterface=" + name); mProvider.addJavascriptInterface(object, name); } @@ -1889,7 +1826,6 @@ public class WebView extends AbsoluteLayout */ public void removeJavascriptInterface(String name) { checkThread(); - if (TRACE) Log.d(LOGTAG, "removeJavascriptInterface=" + name); mProvider.removeJavascriptInterface(name); } @@ -1905,7 +1841,6 @@ public class WebView extends AbsoluteLayout */ public WebMessagePort[] createWebMessageChannel() { checkThread(); - if (TRACE) Log.d(LOGTAG, "createWebMessageChannel"); return mProvider.createWebMessageChannel(); } @@ -1920,7 +1855,6 @@ public class WebView extends AbsoluteLayout */ public void postMessageToMainFrame(WebMessage message, Uri targetOrigin) { checkThread(); - if (TRACE) Log.d(LOGTAG, "postMessageToMainFrame. TargetOrigin=" + targetOrigin); mProvider.postMessageToMainFrame(message, targetOrigin); } @@ -2024,7 +1958,6 @@ public class WebView extends AbsoluteLayout public void flingScroll(int vx, int vy) { checkThread(); - if (TRACE) Log.d(LOGTAG, "flingScroll"); mProvider.flingScroll(vx, vy); } |