Merge "Integrate 9174add7 into tools_r8. DO NOT MERGE" into tools_r8

1 files changed, 5 insertions, 1 deletions

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
index 4661833..fe51f19 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java
@@ -35,6 +35,7 @@ import com.android.sdklib.internal.repository.SdkRepoSource;
 import com.android.sdklib.internal.repository.SdkSource;

 import com.android.sdklib.internal.repository.SdkSourceCategory;

 import com.android.sdklib.internal.repository.SdkSources;

+import com.android.sdklib.internal.repository.ToolPackage;

 import com.android.sdklib.internal.repository.AddonsListFetcher.Site;

 import com.android.sdklib.repository.SdkAddonConstants;

 import com.android.sdklib.repository.SdkAddonsListConstants;

@@ -407,6 +408,7 @@ class UpdaterData implements IUpdaterData {
                 monitor.setDescription("Preparing to install archives");

 

                 boolean installedAddon = false;

+                boolean installedTools = false;

                 boolean installedPlatformTools = false;

 

                 // Mark all current local archives as already installed.

@@ -466,6 +468,8 @@ class UpdaterData implements IUpdaterData {
                             // Check if we successfully installed a platform-tool or add-on package.

                             if (archive.getParentPackage() instanceof AddonPackage) {

                                 installedAddon = true;

+                            } else if (archive.getParentPackage() instanceof ToolPackage) {

+                                installedTools = true;

                             } else if (archive.getParentPackage() instanceof PlatformToolPackage) {

                                 installedPlatformTools = true;

                             }

@@ -521,7 +525,7 @@ class UpdaterData implements IUpdaterData {
                     askForAdbRestart(monitor);

                 }

 

-                if (installedPlatformTools) {

+                if (installedTools) {

                     notifyToolsNeedsToBeRestarted();

                 }