From 0150835bb03cd3376256ea5f5422043242709379 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Fri, 21 Nov 2014 07:47:27 -0600 Subject: [PATCH] Add support for BCP-47 - Switch to BCP-47 was to move away from hideous java locale toString - mnc1 padded to mnc01 - mnc10 padded to mnc010 --- .../java/brut/androlib/res/data/ResConfigFlags.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 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 9015736b..998ec86e 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 @@ -144,7 +144,12 @@ public class ResConfigFlags { ret.append("-mcc").append(String.format("%03d", mcc)); if (mcc != MNC_ZERO) { if (mnc != 0 && mnc != -1) { - ret.append("-mnc").append(mnc); + ret.append("-mnc"); + if (mnc > 0 && mnc < 10) { + ret.append(String.format("%02d", mnc)); + } else { + ret.append(String.format("%03d", mnc)); + } } } } @@ -430,8 +435,8 @@ public class ResConfigFlags { public final static int DENSITY_XHIGH = 320; public final static int DENSITY_XXHIGH = 480; public final static int DENSITY_XXXHIGH = 640; - public final static int DENSITY_ANY = 0xFE; - public final static int DENSITY_NONE = 0xFF; + public final static int DENSITY_ANY = 0xFFFE; + public final static int DENSITY_NONE = 0xFFFF; public final static int MNC_ZERO = 0xFF;