Integrate 9174add7 into tools_r8. DO NOT MERGE

SDK Manager fix: message to restart after tools update.

The latest CL made this appear after a platform-tools update instead.

Change-Id: Ib52cf88adfb1557c112c3a8153dad536c5932fa3

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 (executable)
--- 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;\r
 import com.android.sdklib.internal.repository.SdkSourceCategory;\r
 import com.android.sdklib.internal.repository.SdkSources;\r
+import com.android.sdklib.internal.repository.ToolPackage;\r
 import com.android.sdklib.internal.repository.AddonsListFetcher.Site;\r
 import com.android.sdklib.repository.SdkAddonConstants;\r
 import com.android.sdklib.repository.SdkAddonsListConstants;\r
@@ -407,6 +408,7 @@ class UpdaterData implements IUpdaterData {
                 monitor.setDescription("Preparing to install archives");\r
 \r
                 boolean installedAddon = false;\r
+                boolean installedTools = false;\r
                 boolean installedPlatformTools = false;\r
 \r
                 // Mark all current local archives as already installed.\r
@@ -466,6 +468,8 @@ class UpdaterData implements IUpdaterData {
                             // Check if we successfully installed a platform-tool or add-on package.\r
                             if (archive.getParentPackage() instanceof AddonPackage) {\r
                                 installedAddon = true;\r
+                            } else if (archive.getParentPackage() instanceof ToolPackage) {\r
+                                installedTools = true;\r
                             } else if (archive.getParentPackage() instanceof PlatformToolPackage) {\r
                                 installedPlatformTools = true;\r
                             }\r
@@ -521,7 +525,7 @@ class UpdaterData implements IUpdaterData {
                     askForAdbRestart(monitor);\r
                 }\r
 \r
-                if (installedPlatformTools) {\r
+                if (installedTools) {\r
                     notifyToolsNeedsToBeRestarted();\r
                 }\r
 \r