diff --git a/framework/src/org/apache/cordova/CordovaInterfaceImpl.java b/framework/src/org/apache/cordova/CordovaInterfaceImpl.java index 84e2c0a4..eccc9663 100644 --- a/framework/src/org/apache/cordova/CordovaInterfaceImpl.java +++ b/framework/src/org/apache/cordova/CordovaInterfaceImpl.java @@ -237,14 +237,6 @@ public class CordovaInterfaceImpl implements CordovaInterface { public boolean hasPermission(String permission) { - if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) - { - int result = activity.checkSelfPermission(permission); - return PackageManager.PERMISSION_GRANTED == result; - } - else - { - return true; - } + return PackageManager.PERMISSION_GRANTED == activity.checkSelfPermission(permission); } } diff --git a/framework/src/org/apache/cordova/PluginManager.java b/framework/src/org/apache/cordova/PluginManager.java index 05029937..9531e8fa 100755 --- a/framework/src/org/apache/cordova/PluginManager.java +++ b/framework/src/org/apache/cordova/PluginManager.java @@ -339,22 +339,11 @@ public class PluginManager { public Object postMessage(String id, Object data) { LOG.d(TAG, "postMessage: " + id); synchronized (this.pluginMap) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - this.pluginMap.forEach((s, plugin) -> { - if (plugin != null) { - plugin.onMessage(id, data); - } - }); - } else { - for (CordovaPlugin plugin : this.pluginMap.values()) { - if (plugin != null) { - Object obj = plugin.onMessage(id, data); - if (obj != null) { - return obj; - } - } + this.pluginMap.forEach((s, plugin) -> { + if (plugin != null) { + plugin.onMessage(id, data); } - } + }); } return ctx.onMessage(id, data); }