Integrate 11357696 into tools_r8. DO NOT MERGE

SDK Manager: Restart ADB after platform-tools update.

Change-Id: Ie59201a3f303e1a9a837e82cbf4a83f620b4e7f2

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 a2092e0..4661833 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
@@ -29,12 +29,12 @@ import com.android.sdklib.internal.repository.ITaskFactory;
 import com.android.sdklib.internal.repository.ITaskMonitor;\r
 import com.android.sdklib.internal.repository.LocalSdkParser;\r
 import com.android.sdklib.internal.repository.Package;\r
+import com.android.sdklib.internal.repository.PlatformToolPackage;\r
 import com.android.sdklib.internal.repository.SdkAddonSource;\r
 import com.android.sdklib.internal.repository.SdkRepoSource;\r
 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,7 +407,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
                 HashSet<Archive> installedArchives = new HashSet<Archive>();\r
@@ -463,11 +463,11 @@ class UpdaterData implements IUpdaterData {
                             // is no longer installed.\r
                             installedArchives.remove(ai.getReplaced());\r
 \r
-                            // Check if we successfully installed a tool or add-on package.\r
+                            // 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
                         }\r
 \r
@@ -511,7 +511,7 @@ class UpdaterData implements IUpdaterData {
                     }\r
                 }\r
 \r
-                if (installedAddon || installedTools) {\r
+                if (installedAddon || installedPlatformTools) {\r
                     // We need to restart ADB. Actually since we don't know if it's even\r
                     // running, maybe we should just kill it and not start it.\r
                     // Note: it turns out even under Windows we don't need to kill adb\r
@@ -521,7 +521,7 @@ class UpdaterData implements IUpdaterData {
                     askForAdbRestart(monitor);\r
                 }\r
 \r
-                if (installedTools) {\r
+                if (installedPlatformTools) {\r
                     notifyToolsNeedsToBeRestarted();\r
                 }\r
 \r
@@ -558,9 +558,8 @@ class UpdaterData implements IUpdaterData {
                 public void run() {\r
                     canRestart[0] = MessageDialog.openQuestion(getWindowShell(),\r
                             "ADB Restart",\r
-                            "A package that depends on ADB has been updated. It is recommended " +\r
-                            "to restart ADB. Is it OK to do it now? If not, you can restart it " +\r
-                            "manually later.");\r
+                            "A package that depends on ADB has been updated. \n" +\r
+                            "Do you want to restart ADB now?");\r
                 }\r
             });\r
         }\r