commit 25bb5f9dd046477269a31c2c2bf3f848a924992e
author Yurii Zubrytskyi <zyy@google.com> Wed Dec 28 21:53:43 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 28 21:53:43 2016 +0000
tree 58f0863c87b23fb5e8564a06936cc46c4e62016b
parent 7d8cdfd4a908454b3637fc74c138835316013766
parent f2e7b71d2c4b2cfc91fae7a4507bc131d1b29474

Merge "[merge][metrics] Fix the update checker's URL" into emu-2.2-release

android/skin/qt/extended-pages/help-page.cpp

diff --git a/android/skin/qt/extended-pages/help-page.cpp b/android/skin/qt/extended-pages/help-page.cpp
index 8d35132..b4909f0 100644
--- a/android/skin/qt/extended-pages/help-page.cpp
+++ b/android/skin/qt/extended-pages/help-page.cpp
@@ -13,7 +13,6 @@
 
 #include "android/android.h"
 #include "android/base/system/System.h"
-#include "android/emulation/ConfigDirs.h"
 #include "android/globals.h"
 #include "android/update-check/UpdateChecker.h"
 #include "android/update-check/VersionExtractor.h"
@@ -178,8 +177,7 @@
 
 void LatestVersionLoadTask::run() {
     // Get latest version that is available online
-    android::update_check::UpdateChecker upCheck(
-            android::ConfigDirs::getUserDirectory().c_str());
+    android::update_check::UpdateChecker upCheck;
     const auto latestVersion = upCheck.getLatestVersion();
     QString latestVerString;
     if (!latestVersion) {

android/update-check/UpdateChecker.cpp

diff --git a/android/update-check/UpdateChecker.cpp b/android/update-check/UpdateChecker.cpp
index c132b70..0516314 100644
--- a/android/update-check/UpdateChecker.cpp
+++ b/android/update-check/UpdateChecker.cpp
@@ -99,7 +99,7 @@
         if (!mCoreVersion.empty()) {
             const ScopedCPtr<char> id(android_studio_get_installation_id());
             url += Uri::FormatEncodeArguments(
-                    "?tool=emulator&uid=%s&os=%s", id.get(),
+                    "?tool=emulator&uid=%s&os=%s&", id.get(),
                     toString(System::get()->getOsType()));
             // append the fields which may change from run to run: version and
             // core version