Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AppSecurityPermissions: changes from Android 5.2

Browse Source
This commit is contained in:
Dominik Schürmann 2016-05-02 00:15:49 +02:00
parent 7ad4941554
commit a2cb5f1ccf
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
View File

@ -61,6 +61,13 @@ import java.util.Set;
* To use this view define a LinearLayout or any ViewGroup and add this * To use this view define a LinearLayout or any ViewGroup and add this
* view by instantiating AppSecurityPermissions and invoking getPermissionsView. * 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 { public class AppSecurityPermissions {
private static final String TAG = "AppSecurityPermissions"; private static final String TAG = "AppSecurityPermissions";
@ -97,11 +104,11 @@ public class AppSecurityPermissions {
public Drawable loadGroupIcon(PackageManager pm) { public Drawable loadGroupIcon(PackageManager pm) {
if (icon != 0) { if (icon != 0) {
return loadIcon(pm); return (Build.VERSION.SDK_INT < 22) ? loadIcon(pm) : loadUnbadgedIcon(pm);
} }
try { try {
ApplicationInfo appInfo = pm.getApplicationInfo(packageName, 0); 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) { } catch (NameNotFoundException e) {
// ignore // ignore
} }