From eae533c5a07755c7040efff10fa51e122d997715 Mon Sep 17 00:00:00 2001
From: Hanks <zhanghan.me@gmail.com>
Date: Mon, 15 Jul 2019 14:42:11 +0800
Subject: [PATCH] [jsfm] Also enable the promise polyfill on Android (#2704)

Since the internal Promise API may have unpredictable behavior on some
legacy Android devices, so using the js polyfill instead (as iOS does).

Modify the js framework version in package.json, since it has already
been updated in https://github.com/apache/incubator-weex/pull/2669
---
 package.json                       | 2 +-
 runtime/shared/polyfill/promise.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 48b5222f5f..80cccf97e1 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "weex",
   "version": "0.12.2",
   "subversion": {
-    "framework": "0.29.6",
+    "framework": "0.29.7",
     "transformer": ">=0.1.5 <0.5"
   },
   "description": "A framework for building Mobile cross-platform UI",
diff --git a/runtime/shared/polyfill/promise.js b/runtime/shared/polyfill/promise.js
index 1bb0ee3654..51fca79345 100644
--- a/runtime/shared/polyfill/promise.js
+++ b/runtime/shared/polyfill/promise.js
@@ -24,7 +24,7 @@ const { WXEnvironment } = global
 
 /* istanbul ignore next */
 if (typeof WXEnvironment !== 'undefined'
-  && WXEnvironment.platform === 'iOS'
+  && (WXEnvironment.platform === 'iOS' || WXEnvironment.platform === 'android')
   && !WXEnvironment.__enable_native_promise__) {
   global.Promise = undefined
 }