commit ca51aaad671f1999dff135b1253fecf0869a3763
author Winson Chung <winsonc@google.com> Tue Jun 02 23:59:42 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 02 23:59:43 2015 +0000
tree 65ca068e7097f5a92f3f7d053b09063970d5f301
parent 59caa60222e55212c13110ca0890023b47356fa5
parent 8f1eff7b6cc8621888ee46605c32e601f80a890b

Merge "Adding context for app launches." into ub-launcher3-burnaby

src/com/android/launcher3/allapps/AlphabeticalAppsList.java

diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index f4d02a1..e284f77 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -29,8 +29,8 @@
 import com.android.launcher3.model.AppNameComparator;
 import com.android.launcher3.util.Thunk;
 
+import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -179,7 +179,7 @@
             mMinAppsPerRow = minAppsPerRow;
             mMinRowsInMergedSection = minRowsInMergedSection;
             mMaxAllowableMerges = maxNumMerges;
-            mAsciiEncoder = StandardCharsets.US_ASCII.newEncoder();
+            mAsciiEncoder = Charset.forName("US-ASCII").newEncoder();
         }
 
         @Override