diff --git a/apps/Development/src/com/android/development/PackageBrowser.java b/apps/Development/src/com/android/development/PackageBrowser.java
index 689183d..eb013ba 100644
--- a/apps/Development/src/com/android/development/PackageBrowser.java
+++ b/apps/Development/src/com/android/development/PackageBrowser.java
@@ -24,6 +24,7 @@
 import android.content.IntentFilter;
 import android.content.BroadcastReceiver;
 import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.RemoteException;
@@ -143,8 +144,9 @@
             if (packageInfo != null) {
                 getPackageManager().deletePackage(packageInfo.info.packageName,
                                                   new IPackageDeleteObserver.Stub() {
-                    public void packageDeleted(boolean succeeded) throws RemoteException {
-                        if (succeeded) {
+                    public void packageDeleted(String packageName, int returnCode)
+                            throws RemoteException {
+                        if (returnCode == PackageManager.DELETE_SUCCEEDED) {
                             mPackageInfoList.remove(curSelection);
                             mHandler.post(new Runnable() {
                                     public void run() {
