From e50bc6fd29dd8bb3291517753aadd2ccec94f24b Mon Sep 17 00:00:00 2001
From: Akira Numata <akira.numata@sonymobile.com>
Date: Tue, 11 Mar 2014 12:53:14 +0900
Subject: [PATCH] Default icon is shown after uninstalling updated priv-app

If updated pre-installed app is moved from "/system/app" to
"/system/priv-app" at FOTA, PackageManager does not update its
resource path correctly. This patch fixes it.

Change-Id: Iac793bcb8fd7c5bfbafd1876640b534c6da5dddf
---
 .../core/java/com/android/server/pm/PackageManagerService.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index b79e15756a112..242baa9b42c93 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -4242,6 +4242,8 @@ public class PackageManagerService extends IPackageManager.Stub {
                                 + " to " + scanFile);
                         updatedPkg.codePath = scanFile;
                         updatedPkg.codePathString = scanFile.toString();
+                        updatedPkg.resourcePath = scanFile;
+                        updatedPkg.resourcePathString = scanFile.toString();
                         // This is the point at which we know that the system-disk APK
                         // for this package has moved during a reboot (e.g. due to an OTA),
                         // so we need to reevaluate it for privilege policy.