From 105925376f8d0f6b318c9938c7b83ef7fef094da Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Wed, 18 Mar 2009 17:39:46 -0700
Subject: auto import from //branches/cupcake_rel/...@140373

---
 cmds/pm/src/com/android/commands/pm/Pm.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'cmds')

diff --git a/cmds/pm/src/com/android/commands/pm/Pm.java b/cmds/pm/src/com/android/commands/pm/Pm.java
index c2d8da5..161bb46 100644
--- a/cmds/pm/src/com/android/commands/pm/Pm.java
+++ b/cmds/pm/src/com/android/commands/pm/Pm.java
@@ -528,8 +528,14 @@ public final class Pm {
         case PackageManager.INSTALL_FAILED_MISSING_SHARED_LIBRARY:
             s = "INSTALL_FAILED_MISSING_SHARED_LIBRARY";
             break;
-        case PackageManager.INSTALL_FAILED_REPLACE_COULDNT_DELETE:
-            s = "INSTALL_FAILED_REPLACE_COULDNT_DELETE";
+        case PackageManager.INSTALL_FAILED_DEXOPT:
+            s = "INSTALL_FAILED_DEXOPT";
+            break;
+        case PackageManager.INSTALL_FAILED_OLDER_SDK:
+            s = "INSTALL_FAILED_OLDER_SDK";
+            break;
+        case PackageManager.INSTALL_FAILED_CONFLICTING_PROVIDER:
+            s = "INSTALL_FAILED_CONFLICTING_PROVIDER";
             break;
         case PackageManager.INSTALL_PARSE_FAILED_NOT_APK:
             s = "INSTALL_PARSE_FAILED_NOT_APK";
@@ -561,9 +567,6 @@ public final class Pm {
         case PackageManager.INSTALL_PARSE_FAILED_MANIFEST_EMPTY:
             s = "INSTALL_PARSE_FAILED_MANIFEST_EMPTY";
             break;
-        case PackageManager.INSTALL_FAILED_OLDER_SDK:
-            s = "INSTALL_FAILED_OLDER_SDK";
-            break;
         default:
             s = Integer.toString(result);
         break;
-- 
cgit v1.1