Add File.separator to end of internalPath

When compiling theme resources, packages that start with the same
internal path end up being processed by AAPT which can cause
conflicts and not allow the theme to be installed.  An example of
this is a theme that overlays both com.google.android.gm and
com.google.android.gms.  When the overlay for com.google.android.gm
is being processed, resources from com.google.android.gms are also
included.  This is easily resolved by appending a file separator
to the end of internalPath.

Change-Id: I98f7e0fd65c54bdd854df1539e815ad76cfa44ae

1 files changed, 1 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 55ee716..1247c07 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -8190,7 +8190,7 @@ public class PackageManagerService extends IPackageManager.Stub {
 
     private void compileResourcesWithAapt(String target, PackageParser.Package pkg)
             throws Exception {
-        String internalPath = APK_PATH_TO_OVERLAY + target;
+        String internalPath = APK_PATH_TO_OVERLAY + target + File.separator;
         String resPath = ThemeUtils.getTargetCacheDir(target, pkg);
         final int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid);
         int pkgId;