| Index: base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
|
| diff --git a/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java b/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
|
| index 242d424aa8780b7b9eb8ef0e947271db8a7f48ed..b369e4d8c29f8c4681474ac80a88bf9584a6ae52 100644
|
| --- a/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
|
| +++ b/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
|
| @@ -28,6 +28,8 @@ import android.os.Process;
|
| import android.os.StatFs;
|
| import android.os.UserManager;
|
| import android.provider.Settings;
|
| +import android.text.Html;
|
| +import android.text.Spanned;
|
| import android.view.View;
|
| import android.view.ViewGroup.MarginLayoutParams;
|
| import android.view.Window;
|
| @@ -281,6 +283,19 @@ public class ApiCompatibilityUtils {
|
| }
|
| }
|
|
|
| + /**
|
| + * @see android.text.Html#toHtml(Spanned, int)
|
| + * @param option is ignored on below N
|
| + */
|
| + @SuppressWarnings("deprecation")
|
| + public static String toHtml(Spanned spanned, int option) {
|
| + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
| + return Html.toHtml(spanned, option);
|
| + } else {
|
| + return Html.toHtml(spanned);
|
| + }
|
| + }
|
| +
|
| // These methods have a new name, and the old name is deprecated.
|
|
|
| /**
|
|
|