diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2018-04-27 08:57:27 -0700 |
|---|---|---|
| committer | Philip P. Moltmann <moltmann@google.com> | 2018-04-27 08:57:27 -0700 |
| commit | c2658513b118afe32c5fda141f4e9bf59f1d53a2 (patch) | |
| tree | ca75cdbbffeca4dd185e2af0a86c77b4d2f4a425 /src | |
| parent | 5d49a5acd9b7b6b126a95d3c797f6c3e17930334 (diff) | |
| download | android_packages_apps_PackageInstaller-c2658513b118afe32c5fda141f4e9bf59f1d53a2.tar.gz android_packages_apps_PackageInstaller-c2658513b118afe32c5fda141f4e9bf59f1d53a2.tar.bz2 android_packages_apps_PackageInstaller-c2658513b118afe32c5fda141f4e9bf59f1d53a2.zip | |
Use Collator to sort app permissions
Test: Looked at sorted list in English, German, Chinese
Change-Id: Id7ae2f7b2aaf004ecdc9692b6e72016c14d4b1ba
Fixes: 77813336
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/packageinstaller/permission/model/AppPermissionGroup.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java index d88ff49f..aafce8df 100644 --- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java +++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java @@ -35,6 +35,7 @@ import com.android.packageinstaller.R; import com.android.packageinstaller.permission.utils.ArrayUtils; import com.android.packageinstaller.permission.utils.LocationUtils; +import java.text.Collator; import java.util.ArrayList; import java.util.List; @@ -48,6 +49,7 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> private final PackageManager mPackageManager; private final AppOpsManager mAppOps; private final ActivityManager mActivityManager; + private final Collator mCollator; private final PackageInfo mPackageInfo; private final String mName; @@ -216,6 +218,8 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> mName = name; mLabel = label; mDescription = description; + mCollator = Collator.getInstance( + context.getResources().getConfiguration().getLocales().get(0)); mRequest = request; if (iconResId != 0) { mIconPkg = iconPkg; @@ -628,7 +632,7 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> @Override public int compareTo(AppPermissionGroup another) { - final int result = mLabel.toString().compareTo(another.mLabel.toString()); + final int result = mCollator.compare(mLabel.toString(), another.mLabel.toString()); if (result == 0) { // Unbadged before badged. return mPackageInfo.applicationInfo.uid |