Skip to content

Commit 907c96f

Browse files
committed
Revert "添加设备信息获取方法"
This reverts commit ef1fb15.
1 parent ef1fb15 commit 907c96f

File tree

2 files changed

+1
-49
lines changed

2 files changed

+1
-49
lines changed

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

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import android.provider.Settings;
1111
import android.support.annotation.RequiresApi;
1212
import android.support.annotation.RequiresPermission;
13-
import android.telecom.TelecomManager;
14-
import android.telephony.TelephonyManager;
1513
import android.text.TextUtils;
1614

1715
import java.io.File;
@@ -22,7 +20,6 @@
2220

2321
import static android.Manifest.permission.ACCESS_WIFI_STATE;
2422
import static android.Manifest.permission.INTERNET;
25-
import static android.Manifest.permission.READ_PHONE_STATE;
2623

2724
/**
2825
* <pre>
@@ -46,8 +43,7 @@ private DeviceUtils() {
4643
public static boolean isDeviceRooted() {
4744
String su = "su";
4845
String[] locations = {"/system/bin/", "/system/xbin/", "/sbin/", "/system/sd/xbin/",
49-
"/system/bin/failsafe/", "/data/local/xbin/", "/data/local/bin/", "/data/local/",
50-
"/system/sbin/", "/usr/bin/", "/vendor/bin/"};
46+
"/system/bin/failsafe/", "/data/local/xbin/", "/data/local/bin/", "/data/local/"};
5147
for (String location : locations) {
5248
if (new File(location + su).exists()) {
5349
return true;
@@ -69,48 +65,6 @@ public static boolean isAdbEnabled() {
6965
) > 0;
7066
}
7167

72-
/**
73-
* Return the imei of device.
74-
*
75-
* @return the imei of device
76-
*/
77-
@SuppressLint("HardwareIds")
78-
@RequiresPermission(value = READ_PHONE_STATE)
79-
public static String getImei() {
80-
String imei = "";
81-
try {
82-
TelephonyManager telephonyMgr = (TelephonyManager) Utils.getApp()
83-
.getApplicationContext().getSystemService(Context.TELEPHONY_SERVICE);
84-
if (telephonyMgr != null) {
85-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
86-
imei = telephonyMgr.getImei();
87-
} else {
88-
imei = telephonyMgr.getDeviceId();
89-
}
90-
}
91-
} catch (Exception e) {
92-
e.printStackTrace();
93-
}
94-
return imei;
95-
}
96-
97-
/**
98-
* Return the serial of device.
99-
*
100-
* @return the serial of device
101-
*/
102-
@SuppressLint("HardwareIds")
103-
@RequiresPermission(value = READ_PHONE_STATE)
104-
public static String getSerial() {
105-
String serial = "";
106-
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
107-
serial = Build.getSerial();
108-
} else {
109-
serial = Build.SERIAL;
110-
}
111-
return serial;
112-
}
113-
11468
/**
11569
* Return the version name of device's system.
11670
*

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ class DeviceActivity : BaseBackActivity() {
5252
appendLine("isAdbEnabled: " + DeviceUtils.isAdbEnabled())
5353
}
5454
}
55-
.appendLine("getImei: " + DeviceUtils.getImei())
56-
.appendLine("getSerial: " + DeviceUtils.getSerial())
5755
.appendLine("getSDKVersionName: " + DeviceUtils.getSDKVersionName())
5856
.appendLine("getSDKVersionCode: " + DeviceUtils.getSDKVersionCode())
5957
.appendLine("getAndroidID: " + DeviceUtils.getAndroidID())

0 commit comments

Comments
 (0)