Merge e2bed82 into 803444d

appium · Sep 23, 2018 · 8b0f0f3 · 8b0f0f3
2 parents 803444d + e2bed82
commit 8b0f0f3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/android-helpers.js b/lib/android-helpers.js
@@ -632,7 +632,7 @@ helpers.initDevice = async function (adb, opts) {
   if (opts.unicodeKeyboard) {
     defaultIME = await helpers.initUnicodeKeyboard(adb);
   }
-  if (_.isUndefined(opts.unlockType)) {
+  if (_.isUndefined(opts.unlockType) && !opts.skipUnlock) {
     await helpers.pushUnlock(adb);
   }
   return defaultIME;