OSDN Git Service

SDK Updater: prevent potential NPE.
authorRaphael <raphael@google.com>
Wed, 27 Jan 2010 01:10:02 +0000 (17:10 -0800)
committerRaphael <raphael@google.com>
Wed, 27 Jan 2010 01:15:13 +0000 (17:15 -0800)
Not that I know how that could happen in the first place
but it can't hurt.

SDK Bug: 2306650

Change-Id: I981f993c815f25e4f596afc029f3e44b5ed73927

sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java

index 8a104e4..627c5a0 100755 (executable)
@@ -612,6 +612,12 @@ final class UpdateChooserDialog extends GridDialog {
         mInternalLicenseRadioUpdate = true;\r
 \r
         ArchiveInfo ai = getSelectedArchive();\r
+\r
+        if (ai == null) {\r
+            // Should never happen.\r
+            return;\r
+        }\r
+\r
         boolean needUpdate = true;\r
 \r
         if (!mLicenseAcceptAll && mLicenseRadioAcceptAll.getSelection()) {\r
@@ -657,6 +663,11 @@ final class UpdateChooserDialog extends GridDialog {
     private void onPackageDoubleClick() {\r
         ArchiveInfo ai = getSelectedArchive();\r
 \r
+        if (ai == null) {\r
+            // Should never happen.\r
+            return;\r
+        }\r
+\r
         boolean wasAccepted = ai.isAccepted();\r
         ai.setAccepted(!wasAccepted);\r
         ai.setRejected(wasAccepted);\r