Merge "Better exceptions when LoadedApk fails." into jb-mr2-dev

2013-02-25 23:41:33 +00:00
parent 84952592ee 208d937b61
commit a2fcddd1e6
1 changed files with 6 additions and 1 deletions
--- a/core/java/android/app/LoadedApk.java
+++ b/core/java/android/app/LoadedApk.java
@@ -362,7 +362,12 @@ public final class LoadedApk {
        try {
            pi = pm.getPackageInfo(mPackageName, 0, UserHandle.myUserId());
        } catch (RemoteException e) {
-            throw new AssertionError(e);
+            throw new IllegalStateException("Unable to get package info for "
+                    + mPackageName + "; is system dying?", e);
+        }
+        if (pi == null) {
+            throw new IllegalStateException("Unable to get package info for "
+                    + mPackageName + "; is package not installed?");
        }
        /*
         * Two possible indications that this package could be