Revert "添加设备信息获取方法"

This reverts commit ef1fb15.

Author: Blankj

utilcode/lib/src/main/java/com/blankj/utilcode/util/DeviceUtils.java

@@ -10,8 +10,6 @@
 import android.provider.Settings;
 import android.support.annotation.RequiresApi;
 import android.support.annotation.RequiresPermission;
-import android.telecom.TelecomManager;
-import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
 import java.io.File;
@@ -22,7 +20,6 @@
 
 import static android.Manifest.permission.ACCESS_WIFI_STATE;
 import static android.Manifest.permission.INTERNET;
-import static android.Manifest.permission.READ_PHONE_STATE;
 
 /**
  * <pre>
@@ -46,8 +43,7 @@ private DeviceUtils() {
     public static boolean isDeviceRooted() {
         String su = "su";
         String[] locations = {"/system/bin/", "/system/xbin/", "/sbin/", "/system/sd/xbin/",
-                "/system/bin/failsafe/", "/data/local/xbin/", "/data/local/bin/", "/data/local/",
-                "/system/sbin/", "/usr/bin/", "/vendor/bin/"};
+                "/system/bin/failsafe/", "/data/local/xbin/", "/data/local/bin/", "/data/local/"};
         for (String location : locations) {
             if (new File(location + su).exists()) {
                 return true;
@@ -69,48 +65,6 @@ public static boolean isAdbEnabled() {
         ) > 0;
     }
 
-    /**
-     * Return the imei of device.
-     *
-     * @return the imei of device
-     */
-    @SuppressLint("HardwareIds")
-    @RequiresPermission(value = READ_PHONE_STATE)
-    public static String getImei() {
-        String imei = "";
-        try {
-            TelephonyManager telephonyMgr = (TelephonyManager) Utils.getApp()
-                    .getApplicationContext().getSystemService(Context.TELEPHONY_SERVICE);
-            if (telephonyMgr != null) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    imei = telephonyMgr.getImei();
-                } else {
-                    imei = telephonyMgr.getDeviceId();
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return imei;
-    }
-
-    /**
-     * Return the serial of device.
-     *
-     * @return the serial of device
-     */
-    @SuppressLint("HardwareIds")
-    @RequiresPermission(value = READ_PHONE_STATE)
-    public static String getSerial() {
-        String serial = "";
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
-            serial = Build.getSerial();
-        } else {
-            serial = Build.SERIAL;
-        }
-        return serial;
-    }
-
     /**
      * Return the version name of device's system.
      *

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/device/DeviceActivity.kt

@@ -52,8 +52,6 @@ class DeviceActivity : BaseBackActivity() {
                         appendLine("isAdbEnabled: " + DeviceUtils.isAdbEnabled())
                     }
                 }
-                .appendLine("getImei: " + DeviceUtils.getImei())
-                .appendLine("getSerial: " + DeviceUtils.getSerial())
                 .appendLine("getSDKVersionName: " + DeviceUtils.getSDKVersionName())
                 .appendLine("getSDKVersionCode: " + DeviceUtils.getSDKVersionCode())
                 .appendLine("getAndroidID: " + DeviceUtils.getAndroidID())