From a9531c4aae5caacda7c14858de3860efb41228b4 Mon Sep 17 00:00:00 2001 From: Peter Wen Date: Thu, 8 Nov 2018 22:47:20 +0000 Subject: [PATCH] Android: Roll android_tools and fix lint errors Update lint to version 26.4.0-alpha03+. This is the first lint update since 2017 September, thus a long list of TODOs is expected. TBR for mechanical fixes to existing lint errors that are only exposed due to update. TBR=mheikal@chromium.org Bug: 900912 Change-Id: I3335834ae308a3411ced51bb2c913b76a8f8d8c3 Reviewed-on: https://chromium-review.googlesource.com/c/1327157 Reviewed-by: Peter Wen Reviewed-by: Mohamed Heikal Commit-Queue: Peter Wen Cr-Commit-Position: refs/heads/master@{#606631} --- DEPS | 2 +- .../chromium/android_webview/AwSettings.java | 2 ++ .../AwWebContentsDelegateAdapter.java | 1 + .../android_webview/CleanupReference.java | 2 ++ ...portLibWebkitToCompatConverterAdapter.java | 5 +++++ .../java/res/layout/edittext_webview.xml | 1 + .../res/layout/activity_webview_browser.xml | 2 ++ build/android/gyp/lint.py | 20 +++++-------------- build/android/lint/suppressions.xml | 17 ++++++++++++++++ build/config/android/internal_rules.gni | 2 +- .../res/drawable/download_home_tabs_bg.xml | 5 ++--- .../res/layout/autofill_local_card_editor.xml | 7 ++++++- .../java/res/layout/autofill_name_fixflow.xml | 2 ++ .../java/res/layout/homepage_editor.xml | 3 +++ .../java/res/layout/new_tab_page_layout.xml | 3 +++ .../res/layout/password_entry_exception.xml | 1 - .../payments_request_editor_textview.xml | 4 +++- .../java/res/layout/search_toolbar.xml | 3 +++ chrome/android/java/res/values-v19/values.xml | 4 ++-- chrome/android/java/res/values/dimens.xml | 19 ++++++++++-------- .../download_manager_section_header.xml | 1 - .../AutofillAssistantUiDelegate.java | 5 ++++- .../infobar/translate/TranslateTabLayout.java | 2 ++ .../test/util/ApplicationTestUtils.java | 3 ++- .../android/java/res/layout/pin_dialog.xml | 3 +++ .../customtabs_benchmark/res/layout/main.xml | 2 +- ui/android/java/res/values/dimens.xml | 3 ++- .../ui/display/DisplayAndroidManager.java | 1 + 28 files changed, 87 insertions(+), 38 deletions(-) diff --git a/DEPS b/DEPS index 644a3a7ea87ed1..bcf3ad0ebffb13 100644 --- a/DEPS +++ b/DEPS @@ -486,7 +486,7 @@ deps = { }, 'src/third_party/android_tools': { - 'url': Var('chromium_git') + '/android_tools.git' + '@' + '130499e25286f4d56acafa252fee09f3cc595c49', + 'url': Var('chromium_git') + '/android_tools.git' + '@' + '6fecaa542f73dd5aeed170d9a4cf340159b42976', 'condition': 'checkout_android_native_support', }, diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.java b/android_webview/java/src/org/chromium/android_webview/AwSettings.java index d5fbe20d248585..912d4363b2c8e0 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwSettings.java +++ b/android_webview/java/src/org/chromium/android_webview/AwSettings.java @@ -4,6 +4,7 @@ package org.chromium.android_webview; +import android.annotation.SuppressLint; import android.content.Context; import android.content.pm.PackageManager; import android.os.Build; @@ -166,6 +167,7 @@ private class EventHandler { EventHandler() { } + @SuppressLint("HandlerLeak") void bindUiThread() { if (mHandler != null) return; mHandler = new Handler(ThreadUtils.getUiThreadLooper()) { diff --git a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java index ad829f6804f674..46e9b1e779b633 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java +++ b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java @@ -179,6 +179,7 @@ public void closeContents() { } @Override + @SuppressLint("HandlerLeak") public void showRepostFormWarningDialog() { // TODO(mkosiba) We should be using something akin to the JsResultReceiver as the // callback parameter (instead of WebContents) and implement a way of converting diff --git a/android_webview/java/src/org/chromium/android_webview/CleanupReference.java b/android_webview/java/src/org/chromium/android_webview/CleanupReference.java index 6242bcfe7d3c84..fb326eff540a45 100644 --- a/android_webview/java/src/org/chromium/android_webview/CleanupReference.java +++ b/android_webview/java/src/org/chromium/android_webview/CleanupReference.java @@ -4,6 +4,7 @@ package org.chromium.android_webview; +import android.annotation.SuppressLint; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -81,6 +82,7 @@ public void run() { * This is lazily initialized as ThreadUtils.getUiThreadLooper() may not be * set yet early in startup. */ + @SuppressLint("HandlerLeak") private static class LazyHolder { static final Handler sHandler = new Handler(ThreadUtils.getUiThreadLooper()) { @Override diff --git a/android_webview/support_library/java/src/org/chromium/support_lib_glue/SupportLibWebkitToCompatConverterAdapter.java b/android_webview/support_library/java/src/org/chromium/support_lib_glue/SupportLibWebkitToCompatConverterAdapter.java index 53f119dfb53ebe..f2f77b0aec9274 100644 --- a/android_webview/support_library/java/src/org/chromium/support_lib_glue/SupportLibWebkitToCompatConverterAdapter.java +++ b/android_webview/support_library/java/src/org/chromium/support_lib_glue/SupportLibWebkitToCompatConverterAdapter.java @@ -4,6 +4,7 @@ package org.chromium.support_lib_glue; +import android.annotation.SuppressLint; import android.webkit.SafeBrowsingResponse; import android.webkit.ServiceWorkerWebSettings; import android.webkit.WebMessagePort; @@ -48,6 +49,7 @@ public InvocationHandler convertWebResourceRequest(WebResourceRequest request) { } // ServiceWorkerWebSettingsBoundaryInterface + @SuppressLint("NewApi") @Override public InvocationHandler convertServiceWorkerSettings( /* ServiceWorkerWebSettings */ Object serviceWorkerWebSettings) { @@ -66,6 +68,7 @@ public InvocationHandler convertServiceWorkerSettings( return new ServiceWorkerSettingsAdapter(supportLibWebSettings.getAwServiceWorkerSettings()); } + @SuppressLint("NewApi") @Override public /* SupportLibWebResourceError */ InvocationHandler convertWebResourceError( /* WebResourceError */ Object webResourceError) { @@ -83,6 +86,7 @@ public InvocationHandler convertServiceWorkerSettings( return new WebResourceErrorAdapter(supportLibError.getAwWebResourceError()); } + @SuppressLint("NewApi") @Override public /* SupportLibSafeBrowsingResponse */ InvocationHandler convertSafeBrowsingResponse( /* SafeBrowsingResponse */ Object safeBrowsingResponse) { @@ -102,6 +106,7 @@ public InvocationHandler convertServiceWorkerSettings( supportLibResponse.getAwSafeBrowsingResponseCallback()); } + @SuppressLint("NewApi") @Override public /* SupportLibWebMessagePort */ InvocationHandler convertWebMessagePort( /* WebMessagePort */ Object webMessagePort) { diff --git a/android_webview/tools/automated_ui_tests/java/res/layout/edittext_webview.xml b/android_webview/tools/automated_ui_tests/java/res/layout/edittext_webview.xml index 5f5a7e7d1b61eb..a242010c94c759 100644 --- a/android_webview/tools/automated_ui_tests/java/res/layout/edittext_webview.xml +++ b/android_webview/tools/automated_ui_tests/java/res/layout/edittext_webview.xml @@ -15,6 +15,7 @@ android:layout_width="match_parent" android:layout_height="280dp" /> + + + + + + @@ -185,6 +190,12 @@ Still reading? + + + + + + @@ -254,12 +265,18 @@ Still reading? + + + + + + diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni index 08de475d8b263d..b04792ff6ba08a 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni @@ -840,7 +840,7 @@ if (enable_java_templates) { lint_suppressions_file = "//build/android/lint/suppressions.xml" } - _lint_path = "$lint_android_sdk_root/tools/bin/lint" + _lint_path = "$lint_android_sdk_root/tools-lint/bin/lint" _cache_dir = "$root_build_dir/android_lint_cache" _result_path = "$target_gen_dir/$target_name/result.xml" _config_path = "$target_gen_dir/$target_name/config.xml" diff --git a/chrome/android/java/res/drawable/download_home_tabs_bg.xml b/chrome/android/java/res/drawable/download_home_tabs_bg.xml index f8c1f06af61086..d7eefef0706284 100644 --- a/chrome/android/java/res/drawable/download_home_tabs_bg.xml +++ b/chrome/android/java/res/drawable/download_home_tabs_bg.xml @@ -10,10 +10,9 @@ - + - \ No newline at end of file + diff --git a/chrome/android/java/res/layout/autofill_local_card_editor.xml b/chrome/android/java/res/layout/autofill_local_card_editor.xml index c939f2e6a3d536..fd3f1765b56953 100644 --- a/chrome/android/java/res/layout/autofill_local_card_editor.xml +++ b/chrome/android/java/res/layout/autofill_local_card_editor.xml @@ -5,7 +5,8 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> + + + @@ -26,7 +27,9 @@ style="@style/PreferenceScreenLayout" android:layout_width="match_parent" android:layout_height="wrap_content" > + + + - \ No newline at end of file + diff --git a/chrome/android/java/res/layout/search_toolbar.xml b/chrome/android/java/res/layout/search_toolbar.xml index 5502342b7ab3d2..fdd662983b882c 100644 --- a/chrome/android/java/res/layout/search_toolbar.xml +++ b/chrome/android/java/res/layout/search_toolbar.xml @@ -6,13 +6,16 @@ + - org.chromium.chrome.browser.preferences.website.ManageSpaceActivity - \ No newline at end of file + org.chromium.chrome.browser.preferences.website.ManageSpaceActivity + diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml index 81f209ead5e854..5237c6aeb656bf 100644 --- a/chrome/android/java/res/values/dimens.xml +++ b/chrome/android/java/res/values/dimens.xml @@ -3,7 +3,7 @@ Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. --> - + 24dp 16dp @@ -231,11 +231,12 @@ 68dp 46dp - 8px - 16px - 8px - 3px - 3px + + 8px + 16px + 8px + 3px + 3px 1dp 375dp 60dp @@ -315,7 +316,8 @@ 64dp 48dp 24dp - 24px + + 24px 4dp 20dp 26dp @@ -409,7 +411,8 @@ 16dp 3dp 10dp - 16px + + 16px 20dp 14dp diff --git a/chrome/android/java/res_download/layout/download_manager_section_header.xml b/chrome/android/java/res_download/layout/download_manager_section_header.xml index be08c017fe9162..87b1e341ac3b10 100644 --- a/chrome/android/java/res_download/layout/download_manager_section_header.xml +++ b/chrome/android/java/res_download/layout/download_manager_section_header.xml @@ -11,7 +11,6 @@ android:layout_height="wrap_content"> + - diff --git a/ui/android/java/res/values/dimens.xml b/ui/android/java/res/values/dimens.xml index 51065cc2cd3781..2003b51f6cda97 100644 --- a/ui/android/java/res/values/dimens.xml +++ b/ui/android/java/res/values/dimens.xml @@ -43,5 +43,6 @@ cannot be retrieved by name. Note: Constants taken directly from Android's core/res/values/config.xml. --> - 12.0mm + + 12.0mm diff --git a/ui/android/java/src/org/chromium/ui/display/DisplayAndroidManager.java b/ui/android/java/src/org/chromium/ui/display/DisplayAndroidManager.java index 0109039e9051fb..4f6e9946197c05 100644 --- a/ui/android/java/src/org/chromium/ui/display/DisplayAndroidManager.java +++ b/ui/android/java/src/org/chromium/ui/display/DisplayAndroidManager.java @@ -219,6 +219,7 @@ private static Context getContext() { return ContextUtils.getApplicationContext(); } + @SuppressLint("NewApi") private static DisplayManager getDisplayManager() { return (DisplayManager) getContext().getSystemService(Context.DISPLAY_SERVICE); }