From 445aba987c4a899d64f6ce736a91cace7b40a435 Mon Sep 17 00:00:00 2001
From: Victor Chang <vichang@google.com>
Date: Thu, 14 Nov 2019 19:22:29 +0000
Subject: [PATCH] Deprecate the use of ICU.addLikelySubtags

Bug: 124232146
Test: m droid
Merged-In: I25ad003c70b5028942d50d8e83d1cc62ee74d31b
Change-Id: I25ad003c70b5028942d50d8e83d1cc62ee74d31b
(cherry picked from commit 57e23f19e618537aea83b2a5678fd3bf36c993bc)
---
 core/java/com/android/internal/app/LocaleHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/app/LocaleHelper.java b/core/java/com/android/internal/app/LocaleHelper.java
index aef4dbf41d350..e3d07aaa8fe87 100644
--- a/core/java/com/android/internal/app/LocaleHelper.java
+++ b/core/java/com/android/internal/app/LocaleHelper.java
@@ -208,7 +208,7 @@ public class LocaleHelper {
      * @return the maximized Locale instance.
      */
     public static Locale addLikelySubtags(Locale locale) {
-        return libcore.icu.ICU.addLikelySubtags(locale);
+        return ULocale.addLikelySubtags(ULocale.forLocale(locale)).toLocale();
     }
 
     /**