fix placement of lollipop natural qualifier check

menshen · Nov 21, 2014 · ad70082 · ad70082
1 parent cd21bd3
commit ad70082
Showing 1 changed file with 4 additions and 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
@@ -352,6 +352,9 @@ private String generateQualifiers() {
     }
 
     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 @@ private short getNaturalSdkVersionRequirement() {
         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 int hashCode() {
     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;