commit 8c7a325225054c22bc687a9b7662513796ec0402
author Patrick Baumann <patb@google.com> Wed Sep 30 16:59:54 2020 +0000
committer Patrick Baumann <patb@google.com> Wed Sep 30 17:14:30 2020 +0000
tree 770e781486318a2132a08cd99263b5c2fd177e1f
parent 2ca98d205756ab6d944558c20ee4d950717ac472

Revert "Handling removing <original-package> tag"

This reverts commit 27c28b94283b491c58d5981fc580cd89e5c251c5.

Reason for revert: Adding verification method.
Bug: 169414761

Change-Id: I7b9d3c786d653a9b00a553e89d7390bcef45c0f2

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index dd7ef5b..6246b28 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -11115,8 +11115,6 @@
                 mSettings.addRenamedPackageLPw(parsedPackage.getRealPackage(),
                         originalPkgSetting.name);
                 mTransferredPackages.add(originalPkgSetting.name);
-            } else {
-                mSettings.removeRenamedPackageLPw(parsedPackage.getPackageName());
             }
         }
         if (pkgSetting.sharedUser != null) {

services/core/java/com/android/server/pm/Settings.java

diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index a7164f9..aeea251 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -476,10 +476,6 @@
         return mRenamedPackages.put(pkgName, origPkgName);
     }
 
-    void removeRenamedPackageLPw(String pkgName) {
-        mRenamedPackages.remove(pkgName);
-    }
-
     public boolean canPropagatePermissionToInstantApp(String permName) {
         return mPermissions.canPropagatePermissionToInstantApp(permName);
     }