am 913d04aa: Merge "Don\'t log the full stack trace when we can\'t load a resource." into honeycomb

* commit '913d04aa3b187beffd7691acb1e61a8b09810bbe': Don't log the full stack trace when we can't load a resource.
2011-01-20 17:04:13 -08:00
parent 6f1ee60033 913d04aa3b
commit 2d821b8cb8
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -570,6 +570,9 @@ final class ApplicationPackageManager extends PackageManager {
        } catch (NameNotFoundException e) {
            Log.w("PackageManager", "Failure retrieving resources for"
                  + appInfo.packageName);
+        } catch (Resources.NotFoundException e) {
+            Log.w("PackageManager", "Failure retrieving resources for"
+                  + appInfo.packageName + ": " + e.getMessage());
        } catch (RuntimeException e) {
            // If an exception was thrown, fall through to return
            // default icon.