Change BuildInfo.hasApkSplits -> BuildInfo.hasLanguageApkSplits

base/android/java/src/org/chromium/base/BuildInfo.java

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.base;
 
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
@@ skipping 116 matching lines @@
 
     /**
      * @return Whether the Android build is M or later.
      */
     public static boolean isMncOrLater() {
         // TODO(bauerb): Update this once the SDK is updated.
         return Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1
                  || TextUtils.equals("MNC", Build.VERSION.CODENAME);
     }
 
+    private static boolean isLanguageSplit(String splitName) {
+        // Names look like "config.XX".
+        return splitName.length() == 9 && splitName.startsWith("config.");

[Yaron, 2015/07/08 21:31:22]

we control the split name, don't we? can we make it more explicit that it's a
language split?

[agrieve, 2015/07/09 00:11:30]

Yeah, I don't love this either, but we don't control the name for resource
splits. Only for abi splits.

+    }
+
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     @CalledByNative
-    public static boolean hasApkSplits(Context context) {
+    public static boolean hasLanguageApkSplits(Context context) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             return false;
         }
-        ApplicationInfo appInfo = context.getApplicationInfo();
-        return appInfo.splitSourceDirs != null && appInfo.splitSourceDirs.length > 0;
+        PackageInfo packageInfo = PackageUtils.getOwnPackageInfo(context);
+        if (packageInfo.splitNames != null) {
+            for (int i = 0; i < packageInfo.splitNames.length; ++i) {
+                if (isLanguageSplit(packageInfo.splitNames[i])) {
+                    return true;
+                }
+            }
+        }
+        return false;
     }
 }