From 501a6df677c9d6eee9348dbb4084e2f729beb3d3 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Tue, 7 Jan 2014 15:06:45 -0600
Subject: [PATCH] only store renamed-manifest-package if the apk requires the
 change

---
 .../src/main/java/brut/androlib/ApkDecoder.java            | 7 ++++++-
 .../src/main/java/brut/androlib/res/AndrolibResources.java | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
index e7dc636a..398c7efb 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
@@ -318,10 +318,15 @@ public class ApkDecoder {
     private void putPackageInfo(Map<String, Object> meta)
             throws AndrolibException {
         String renamed = getResTable().getPackageRenamed();
+        String original = getResTable().getPackageOriginal();
         int id = getResTable().getPackageId();
 
         HashMap<String, String> packages = new HashMap<String, String>();
-        packages.put("rename-manifest-package", renamed);
+
+        // only put rename-manifest-package into apktool.yml, if the change will be required
+        if (!renamed.equalsIgnoreCase(original)) {
+            packages.put("rename-manifest-package", renamed);
+        }
         packages.put("forced-package-id", String.valueOf(id));
         meta.put("packageInfo", packages);
     }
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
index 65846d99..112253a0 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
@@ -181,7 +181,6 @@ final public class AndrolibResources {
         mPackageOriginal = resPackage.getName();
         mPackageRenamed = resTable.getPackageRenamed();
 
-
         resTable.setPackageId(resPackage.getId());
         resTable.setPackageOriginal(mPackageOriginal);