Android-x86
Fork| Revision | 54cf88137a0b392c26144b5d8c8b87291075309d (tree) |
|---|---|
| Time | 2011-10-22 12:41:08 |
| Author | Raphael <raphael@goog...> |
| Commiter | Android (Google) Code Review |
Merge "Prevent NPE in 'android update project'."
| @@ -535,6 +535,10 @@ public class ProjectCreator { | ||
| 535 | 535 | while (true) { |
| 536 | 536 | String propName = ProjectProperties.PROPERTY_LIB_REF + Integer.toString(index); |
| 537 | 537 | assert props != null; |
| 538 | + if (props == null) { | |
| 539 | + // This should not happen yet SDK bug 20535 says it can, not sure how. | |
| 540 | + break; | |
| 541 | + } | |
| 538 | 542 | String ref = props.getProperty(propName); |
| 539 | 543 | if (ref == null) { |
| 540 | 544 | break; |
sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java