Land rapid7#5949, is_root? for remove_lock_root

Author: wvu

lib/msf/core/post.rb

@@ -16,6 +16,7 @@ class Msf::Post < Msf::Module
   require 'msf/core/post/solaris'
   require 'msf/core/post/unix'
   require 'msf/core/post/windows'
+  require 'msf/core/post/android'
 
   include Msf::PostMixin
 

modules/post/android/manage/remove_lock_root.rb

@@ -4,11 +4,11 @@
 ##
 
 require 'msf/core'
-require 'rex'
 
 class Metasploit4 < Msf::Post
 
   include Msf::Post::Common
+  include Msf::Post::Android::Priv
 
   def initialize(info={})
     super( update_info( info, {
@@ -28,10 +28,9 @@ def initialize(info={})
   end
 
   def run
-    id = cmd_exec('id')
-    unless id =~ /root/
-      #print_error("This module requires root permissions")
-      #return
+    unless is_root?
+      print_error("This module requires root permissions.")
+      return
     end
 
     %W{