Merge "SDK Updater: prevent potential NPE." into eclairandroid-2.1_r2eclair-release

1 files changed, 11 insertions, 0 deletions

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java
index 8a104e4c8..627c5a037 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java
@@ -612,6 +612,12 @@ final class UpdateChooserDialog extends GridDialog {
         mInternalLicenseRadioUpdate = true;

 

         ArchiveInfo ai = getSelectedArchive();

+

+        if (ai == null) {

+            // Should never happen.

+            return;

+        }

+

         boolean needUpdate = true;

 

         if (!mLicenseAcceptAll && mLicenseRadioAcceptAll.getSelection()) {

@@ -657,6 +663,11 @@ final class UpdateChooserDialog extends GridDialog {
     private void onPackageDoubleClick() {

         ArchiveInfo ai = getSelectedArchive();

 

+        if (ai == null) {

+            // Should never happen.

+            return;

+        }

+

         boolean wasAccepted = ai.isAccepted();

         ai.setAccepted(!wasAccepted);

         ai.setRejected(wasAccepted);