If the installation of Yosemite.apk fails, but the phone has an old v…

…ersion, the installation is not mandatory

(cherry picked from commit 1bb17d4)
(cherry picked from commit 90d9eb2)

airtest/core/android/yosemite.py

@@ -37,7 +37,13 @@ def _install_apk_upgrade(self, apk_path, package):
         installed_version = self.adb.get_package_version(package)
         LOGGING.info("local version code is {}, installed version code is {}".format(apk_version, installed_version))
         if installed_version is None or apk_version > int(installed_version):
-            self.adb.install_app(apk_path, replace=True, install_options=["-t", "-g"])
+            try:
+                self.adb.install_app(apk_path, replace=True, install_options=["-t", "-g"])
+            except:
+                if installed_version is None:
+                    raise
+                # If the installation fails, but the phone has an old version, do not force the installation
+                LOGGING.error("Yosemite.apk update failed, please try to reinstall manually.")
 
     @on_method_ready('install_or_upgrade')
     def get_ready(self):