From a2cb5f1ccf588ce3a8a5cd37c8f68249abc7372c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 2 May 2016 00:15:49 +0200 Subject: [PATCH] AppSecurityPermissions: changes from Android 5.2 --- .../privileged/views/AppSecurityPermissions.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java index 23afc1e91..3a8a584f7 100644 --- a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java +++ b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java @@ -61,6 +61,13 @@ import java.util.Set; * To use this view define a LinearLayout or any ViewGroup and add this * view by instantiating AppSecurityPermissions and invoking getPermissionsView. */ + +/** + * NOTES: + * Based on AOSP core/java/android/widget/AppSecurityPermissions + * ec2d48b96d1f95fb266914df294a27c210f8c3f5 + */ +@TargetApi(Build.VERSION_CODES.M) public class AppSecurityPermissions { private static final String TAG = "AppSecurityPermissions"; @@ -97,11 +104,11 @@ public class AppSecurityPermissions { public Drawable loadGroupIcon(PackageManager pm) { if (icon != 0) { - return loadIcon(pm); + return (Build.VERSION.SDK_INT < 22) ? loadIcon(pm) : loadUnbadgedIcon(pm); } try { ApplicationInfo appInfo = pm.getApplicationInfo(packageName, 0); - return appInfo.loadIcon(pm); + return (Build.VERSION.SDK_INT < 22) ? appInfo.loadIcon(pm) : appInfo.loadUnbadgedIcon(pm); } catch (NameNotFoundException e) { // ignore }