From ad70082ebfe01002259e3d29f596a7db05711195 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Fri, 21 Nov 2014 07:58:42 -0600 Subject: [PATCH] fix placement of lollipop natural qualifier check --- .../main/java/brut/androlib/res/data/ResConfigFlags.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java index 998ec86e..9a353372 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java @@ -352,6 +352,9 @@ public class ResConfigFlags { } private short getNaturalSdkVersionRequirement() { + if (density == DENSITY_ANY) { + return SDK_LOLLIPOP; + } if (smallestScreenWidthDp != 0 || screenWidthDp != 0 || screenHeightDp != 0) { return SDK_HONEYCOMB_MR2; } @@ -361,9 +364,6 @@ public class ResConfigFlags { if ((screenLayout & (MASK_SCREENSIZE | MASK_SCREENLONG)) != SCREENSIZE_ANY || density != DENSITY_DEFAULT) { return SDK_DONUT; } - if (density == DENSITY_ANY) { - return SDK_LOLLIPOP; - } return 0; } @@ -438,7 +438,7 @@ public class ResConfigFlags { public final static int DENSITY_ANY = 0xFFFE; public final static int DENSITY_NONE = 0xFFFF; - public final static int MNC_ZERO = 0xFF; + public final static int MNC_ZERO = 0xFFFF; public final static short MASK_LAYOUTDIR = 0xc0; public final static short SCREENLAYOUT_LAYOUTDIR_ANY = 0x00;