summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraurimas <aurimas@chromium.org>2015-09-30 17:56:20 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-01 00:57:14 +0000
commit088bb6bbf50f6ff6cba12f29728fdbc54d0b3fc3 (patch)
tree588b4b769037f3b7775946804ac72d1769764a4a
parent98ffdcbded9a381137cc373add87737e690331b7 (diff)
downloadchromium_src-088bb6bbf50f6ff6cba12f29728fdbc54d0b3fc3.zip
chromium_src-088bb6bbf50f6ff6cba12f29728fdbc54d0b3fc3.tar.gz
chromium_src-088bb6bbf50f6ff6cba12f29728fdbc54d0b3fc3.tar.bz2
Reenable deprecation warning checking.
Supress all the existing deprecation warnings, add TODO's and reenable deprecation warning check. BUG=503148 TBR=nyquist@chromium.org,qinmin@chromium.org Review URL: https://codereview.chromium.org/1368333003 Cr-Commit-Position: refs/heads/master@{#351689}
-rw-r--r--base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java12
-rwxr-xr-xbuild/android/gyp/javac.py3
-rw-r--r--chrome/android/java/src/org/chromium/chrome/browser/CertificateViewer.java2
-rw-r--r--chrome/android/java/src/org/chromium/chrome/browser/ItemChooserDialog.java2
-rw-r--r--chrome/android/java/src/org/chromium/chrome/browser/bookmark/AsyncTaskFragment.java9
-rw-r--r--chrome/android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java3
-rw-r--r--chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillPreferences.java9
-rw-r--r--chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java4
-rw-r--r--chrome/android/java/src/org/chromium/chrome/browser/widget/FloatLabelLayout.java3
-rw-r--r--chrome/android/java/src/org/chromium/chrome/browser/widget/TextBubble.java2
-rw-r--r--chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTestBase.java35
-rw-r--r--chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationUIManagerTest.java2
-rw-r--r--chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationTestUtils.java2
-rw-r--r--chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtils.java3
-rw-r--r--media/base/android/java/src/org/chromium/media/MediaCodecBridge.java2
-rw-r--r--media/base/android/java/src/org/chromium/media/MediaDrmBridge.java2
-rw-r--r--net/net.gyp2
-rw-r--r--ui/android/java/src/org/chromium/ui/picker/DateTimePickerDialog.java2
-rw-r--r--ui/android/javatests/src/org/chromium/ui/picker/DateTimePickerDialogTest.java2
19 files changed, 73 insertions, 28 deletions
diff --git a/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java b/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
index 39ac0c8..cff0e37 100644
--- a/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
+++ b/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
@@ -436,4 +436,16 @@ public class ApiCompatibilityUtils {
return res.getColorStateList(id);
}
}
+
+ /**
+ * @see android.widget.TextView#setTextAppearance(int id).
+ */
+ @SuppressWarnings("deprecation")
+ public static void setTextAppearance(TextView view, int id) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+ view.setTextAppearance(id);
+ } else {
+ view.setTextAppearance(view.getContext(), id);
+ }
+ }
}
diff --git a/build/android/gyp/javac.py b/build/android/gyp/javac.py
index deb90c5..eb17acc 100755
--- a/build/android/gyp/javac.py
+++ b/build/android/gyp/javac.py
@@ -335,8 +335,7 @@ def main(argv):
])
if options.chromium_code:
- # TODO(aurimas): re-enable '-Xlint:deprecation' checks once they are fixed.
- javac_cmd.extend(['-Xlint:unchecked'])
+ javac_cmd.extend(['-Xlint:unchecked', '-Xlint:deprecation'])
else:
# XDignore.symbol.file makes javac compile against rt.jar instead of
# ct.sym. This means that using a java internal package/class will not
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/CertificateViewer.java b/chrome/android/java/src/org/chromium/chrome/browser/CertificateViewer.java
index 79bdda7..446f8bb 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/CertificateViewer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/CertificateViewer.java
@@ -77,7 +77,7 @@ class CertificateViewer implements OnItemSelectedListener {
TextView title = new TextView(mContext);
title.setText(R.string.certtitle);
- title.setTextAppearance(mContext, android.R.style.TextAppearance_Large);
+ ApiCompatibilityUtils.setTextAppearance(title, android.R.style.TextAppearance_Large);
title.setTypeface(title.getTypeface(), Typeface.BOLD);
title.setPadding(mPadding, mPadding, mPadding, mPadding / 2);
dialogContainer.addView(title);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ItemChooserDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/ItemChooserDialog.java
index e920b4c..fb192fb 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ItemChooserDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ItemChooserDialog.java
@@ -204,7 +204,7 @@ public class ItemChooserDialog {
} else {
view.setBackground(null);
if (!isEnabled(position)) {
- view.setTextColor(getContext().getResources().getColor(
+ view.setTextColor(ApiCompatibilityUtils.getColor(getContext().getResources(),
R.color.primary_text_disabled_material_light));
} else {
view.setTextColor(mDefaultTextColor);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmark/AsyncTaskFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmark/AsyncTaskFragment.java
index cfa1d60..5bb8a97 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmark/AsyncTaskFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmark/AsyncTaskFragment.java
@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.bookmark;
import android.app.Activity;
import android.app.Fragment;
import android.app.ProgressDialog;
+import android.content.Context;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
@@ -160,6 +161,8 @@ public class AsyncTaskFragment extends Fragment {
}
}
+ // TODO: remove this than we only support Build.VERSION_CODES.M and newer.
+ @SuppressWarnings("deprecation")
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
@@ -167,6 +170,12 @@ public class AsyncTaskFragment extends Fragment {
}
@Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ showDialog();
+ }
+
+ @Override
public void onDetach() {
super.onDetach();
hideDialog();
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java b/chrome/android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java
index 528e52a..96530e4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-
package org.chromium.chrome.browser.database;
import android.database.AbstractCursor;
@@ -16,6 +15,8 @@ import java.sql.Types;
/**
* This class exposes the query result from native side.
*/
+// TODO(michaelbai): fix deprecation warnings crbug.com/528085
+@SuppressWarnings("deprecation")
public class SQLiteCursor extends AbstractCursor {
private static final String TAG = "SQLiteCursor";
// Used by JNI.
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillPreferences.java
index 8fc6910..0602f73 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillPreferences.java
@@ -5,6 +5,7 @@
package org.chromium.chrome.browser.preferences.autofill;
import android.app.Activity;
+import android.content.Context;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
@@ -181,9 +182,17 @@ public class AutofillPreferences extends PreferenceFragment
PersonalDataManager.getInstance().unregisterDataObserver(this);
}
+ // TODO: remove this than we only support Build.VERSION_CODES.M and newer.
+ @SuppressWarnings("deprecation")
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
PersonalDataManager.getInstance().registerDataObserver(this);
}
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ PersonalDataManager.getInstance().registerDataObserver(this);
+ }
}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java
index 6af20a1..5711aa6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java
@@ -187,7 +187,7 @@ public class WebappActivity extends FullScreenActivity {
private void initializeSplashScreen() {
final int backgroundColor = mWebappInfo.backgroundColor(
- getResources().getColor(R.color.webapp_default_bg));
+ ApiCompatibilityUtils.getColor(getResources(), R.color.webapp_default_bg));
ViewGroup contentView = (ViewGroup) findViewById(android.R.id.content);
mSplashScreen = createSplashScreen(contentView);
@@ -376,7 +376,7 @@ public class WebappActivity extends FullScreenActivity {
splashIconView.setImageBitmap(displayIcon);
if (ColorUtils.shoudUseLightForegroundOnBackground(backgroundColor)) {
- appNameView.setTextColor(getResources().getColor(
+ appNameView.setTextColor(ApiCompatibilityUtils.getColor(getResources(),
R.color.webapp_splash_title_light));
}
}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/FloatLabelLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/FloatLabelLayout.java
index e6a2de4..b7bca14 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/widget/FloatLabelLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/FloatLabelLayout.java
@@ -23,6 +23,7 @@ import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
+import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.chrome.R;
/**
@@ -100,7 +101,7 @@ public class FloatLabelLayout extends LinearLayout {
ViewCompat.setPivotX(mLabel, 0f);
ViewCompat.setPivotY(mLabel, 0f);
- mLabel.setTextAppearance(context,
+ ApiCompatibilityUtils.setTextAppearance(mLabel,
a.getResourceId(R.styleable.FloatLabelLayout_floatLabelTextAppearance,
android.R.style.TextAppearance_Small));
a.recycle();
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/TextBubble.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/TextBubble.java
index b90dbb0..5601a04 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/widget/TextBubble.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/TextBubble.java
@@ -87,7 +87,7 @@ public class TextBubble
: android.R.style.Animation);
mTooltipText = new TextView(context);
- mTooltipText.setTextAppearance(context,
+ ApiCompatibilityUtils.setTextAppearance(mTooltipText,
(res.containsKey(TEXT_STYLE_ID) ? res.getInt(TEXT_STYLE_ID) : R.style.info_bubble));
setContentView(mTooltipText);
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTestBase.java
index 6be2de9..3c8ce13 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTestBase.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityCheckerTestBase.java
@@ -7,14 +7,6 @@ package org.chromium.chrome.browser.feedback;
import android.os.Handler;
import android.os.HandlerThread;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpStatus;
-import org.apache.http.HttpVersion;
-import org.apache.http.message.BasicHttpResponse;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.params.HttpParams;
import org.chromium.content.browser.test.NativeLibraryTestBase;
import org.chromium.net.test.BaseHttpTestServer;
@@ -27,6 +19,8 @@ import java.net.Socket;
* It includes a {@link ConnectivityTestServer} which is set up and torn down automatically
* for tests.
*/
+// TODO(nyquist): fix deprecation warnings crbug.com/537053
+@SuppressWarnings("deprecation")
public class ConnectivityCheckerTestBase extends NativeLibraryTestBase {
static final int TIMEOUT_MS = 5000;
/**
@@ -116,15 +110,17 @@ public class ConnectivityCheckerTestBase extends NativeLibraryTestBase {
}
@Override
- protected HttpParams getConnectionParams() {
- HttpParams httpParams = new BasicHttpParams();
- httpParams.setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_1);
+ protected org.apache.http.params.HttpParams getConnectionParams() {
+ org.apache.http.params.HttpParams httpParams =
+ new org.apache.http.params.BasicHttpParams();
+ httpParams.setParameter(org.apache.http.params.CoreProtocolPNames.PROTOCOL_VERSION,
+ org.apache.http.HttpVersion.HTTP_1_1);
return httpParams;
}
@Override
- protected void handleGet(HttpRequest request, HttpResponseCallback callback)
- throws HttpException {
+ protected void handleGet(org.apache.http.HttpRequest request, HttpResponseCallback callback)
+ throws org.apache.http.HttpException {
String requestPath = request.getRequestLine().getUri();
if (GENERATE_204_SLOW_PATH.equals(requestPath)) {
sendDelayedResponse(callback, requestPath);
@@ -149,22 +145,23 @@ public class ConnectivityCheckerTestBase extends NativeLibraryTestBase {
private void sendResponse(HttpResponseCallback callback, String requestPath) {
int httpStatus = getStatusCodeFromRequestPath(requestPath);
String reason = String.valueOf(httpStatus);
- callback.onResponse(new BasicHttpResponse(HttpVersion.HTTP_1_1, httpStatus, reason));
+ callback.onResponse(new org.apache.http.message.BasicHttpResponse(
+ org.apache.http.HttpVersion.HTTP_1_1, httpStatus, reason));
}
private int getStatusCodeFromRequestPath(String requestPath) {
switch (requestPath) {
case GENERATE_200_PATH:
- return HttpStatus.SC_OK;
+ return org.apache.http.HttpStatus.SC_OK;
case GENERATE_204_PATH: // Intentional fall through.
case GENERATE_204_SLOW_PATH:
- return HttpStatus.SC_NO_CONTENT;
+ return org.apache.http.HttpStatus.SC_NO_CONTENT;
case GENERATE_302_PATH:
- return HttpStatus.SC_MOVED_TEMPORARILY;
+ return org.apache.http.HttpStatus.SC_MOVED_TEMPORARILY;
case GENERATE_404_PATH:
- return HttpStatus.SC_NOT_FOUND;
+ return org.apache.http.HttpStatus.SC_NOT_FOUND;
default:
- return HttpStatus.SC_INTERNAL_SERVER_ERROR;
+ return org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR;
}
}
}
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationUIManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationUIManagerTest.java
index e23c096..792375e 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationUIManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationUIManagerTest.java
@@ -41,6 +41,8 @@ import java.util.concurrent.TimeoutException;
*/
// TODO(peter): remove @SuppressLint once crbug.com/501900 is fixed.
@SuppressLint("NewApi")
+// TODO(peter): fix deprecation warnings crbug.com/528076
+@SuppressWarnings("deprecation")
public class NotificationUIManagerTest extends ChromeActivityTestCaseBase<ChromeActivity> {
private static final String NOTIFICATION_TEST_PAGE =
TestHttpServerClient.getUrl("chrome/test/data/notifications/android_test.html");
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationTestUtils.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationTestUtils.java
index be8b6d8..e3d2288 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationTestUtils.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationTestUtils.java
@@ -30,6 +30,8 @@ public class ApplicationTestUtils {
private static PowerManager.WakeLock sWakeLock = null;
+ // TODO(jbudorick): fix deprecation warning crbug.com/537347
+ @SuppressWarnings("deprecation")
public static void setUp(Context context, boolean clearAppData, boolean checkHttpServer)
throws Exception {
if (clearAppData) {
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtils.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtils.java
index c351d72..7b95378 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtils.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtils.java
@@ -160,6 +160,8 @@ public class ChromeSigninUtils {
/**
* Removes all Google accounts from the OS.
*/
+ // TODO(jbudorick): fix deprecation warnings crbug.com/537352
+ @SuppressWarnings("deprecation")
public void removeAllGoogleAccountsFromOs() {
for (Account acct : mAccountManager.getAccountsByType(GOOGLE_ACCOUNT_TYPE)) {
mAccountManager.removeAccount(acct, null, null);
@@ -196,6 +198,7 @@ public class ChromeSigninUtils {
}
}
+ @Override
public void run(AccountManagerFuture<Bundle> future) {
Bundle resultBundle;
try {
diff --git a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
index c639d4b..38a0818 100644
--- a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
+++ b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
@@ -790,6 +790,8 @@ class MediaCodecBridge {
}
}
+ // TODO(xhwang): fix deprecation warnings crbug.com/527916
+ @SuppressWarnings("deprecation")
private int getAudioFormat(int channelCount) {
switch (channelCount) {
case 1:
diff --git a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
index 431a0a5..6d71eb6 100644
--- a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
+++ b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
@@ -946,6 +946,8 @@ public class MediaDrmBridge {
});
}
+ // TODO(xhwang): fix deprecation warnings crbug.com/527916
+ @SuppressWarnings("deprecation")
private class EventListener implements MediaDrm.OnEventListener {
@Override
public void onEvent(
diff --git a/net/net.gyp b/net/net.gyp
index e54ba2d5..2b2b343 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1415,6 +1415,8 @@
'type': 'none',
'variables': {
'java_in_dir': '../net/test/android/javatests',
+ # TODO(jbudorick): remove chromium_code: 0 line once crbug.com/488192 is fixed.
+ 'chromium_code': 0,
},
'dependencies': [
'net_java',
diff --git a/ui/android/java/src/org/chromium/ui/picker/DateTimePickerDialog.java b/ui/android/java/src/org/chromium/ui/picker/DateTimePickerDialog.java
index 90c9f9d..c621a24 100644
--- a/ui/android/java/src/org/chromium/ui/picker/DateTimePickerDialog.java
+++ b/ui/android/java/src/org/chromium/ui/picker/DateTimePickerDialog.java
@@ -22,6 +22,8 @@ import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.TimeZone;
+// TODO(tkent): fix deprecation warnings crbug.com/537037
+@SuppressWarnings("deprecation")
public class DateTimePickerDialog extends AlertDialog implements OnClickListener,
OnDateChangedListener, OnTimeChangedListener {
private final DatePicker mDatePicker;
diff --git a/ui/android/javatests/src/org/chromium/ui/picker/DateTimePickerDialogTest.java b/ui/android/javatests/src/org/chromium/ui/picker/DateTimePickerDialogTest.java
index 6e2a43e..251ab4d 100644
--- a/ui/android/javatests/src/org/chromium/ui/picker/DateTimePickerDialogTest.java
+++ b/ui/android/javatests/src/org/chromium/ui/picker/DateTimePickerDialogTest.java
@@ -12,6 +12,8 @@ import android.widget.TimePicker;
* Tests for DateTimePickerDialog.
*/
public class DateTimePickerDialogTest extends InstrumentationTestCase {
+ //TODO(tkent): fix deprecation warnings crbug.com/537037
+ @SuppressWarnings("deprecation")
@SmallTest
public void testOnTimeChanged() {
int september = 8;