Skip to content

Commit 6cca345

Browse files
committed
Add ABI info to DeviceInfo
1 parent 8ffad07 commit 6cca345

File tree

1 file changed

+38
-10
lines changed

1 file changed

+38
-10
lines changed

app/src/main/java/fuzion24/device/vulnerability/util/DeviceInfo.java

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ public class DeviceInfo {
1818
private final String buildRelease;
1919
private final String buildSDK;
2020
private final String buildFingerPrint;
21+
private final String buildCpuABI;
22+
private final String buildCpuABI2;
23+
private final String[] supported32BitABIS;
24+
private final String[] supported64BitABIS;
25+
private final String[] supportedABIS;
26+
2127

2228

2329
private final String buildID;
@@ -30,7 +36,12 @@ private DeviceInfo(String kVer,
3036
String bRelease,
3137
String bSDK,
3238
String bFingerPrint,
33-
String bID){
39+
String bID,
40+
String bCPUABI,
41+
String bCPUABI2,
42+
String[] bCPU32List,
43+
String[] bCPU64List,
44+
String[] bABIS){
3445
this.kernelVersion = kVer;
3546
this.buildManufacturer = bManufacturer;
3647
this.buildBrand = bBrand;
@@ -39,18 +50,30 @@ private DeviceInfo(String kVer,
3950
this.buildSDK = bSDK;
4051
this.buildFingerPrint = bFingerPrint;
4152
this.buildID = bID;
53+
this.buildCpuABI = bCPUABI;
54+
this.buildCpuABI2 = bCPUABI2;
55+
this.supported32BitABIS = bCPU32List;
56+
this.supported64BitABIS = bCPU64List;
57+
this.supportedABIS = bABIS;
4258
}
4359

4460
public static DeviceInfo getDeviceInfo() {
4561

46-
String kVer = readKernelVersion();
47-
String bManufac = Build.MANUFACTURER;
48-
String bBrand = Build.BRAND;
49-
String bModel = Build.MODEL;
50-
String bRelease = Build.VERSION.RELEASE;
51-
String bSdk = Build.VERSION.SDK;
52-
String bFingerPrint = Build.FINGERPRINT;
53-
String bID = Build.ID;
62+
String kVer = readKernelVersion();
63+
String bManufac = Build.MANUFACTURER;
64+
String bBrand = Build.BRAND;
65+
String bModel = Build.MODEL;
66+
String bRelease = Build.VERSION.RELEASE;
67+
String bSdk = Build.VERSION.SDK;
68+
String bFingerPrint = Build.FINGERPRINT;
69+
String bID = Build.ID;
70+
String bCPUABI = Build.CPU_ABI;
71+
String bCPUABI2 = Build.CPU_ABI2;
72+
String[] bCPU32List = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ? Build.SUPPORTED_32_BIT_ABIS : new String[]{};
73+
String[] bCPU64List = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ? Build.SUPPORTED_64_BIT_ABIS : new String[]{};
74+
String[] bABIS = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ? Build.SUPPORTED_ABIS : new String[]{};
75+
76+
5477

5578
return new DeviceInfo(kVer,
5679
bManufac,
@@ -59,7 +82,12 @@ public static DeviceInfo getDeviceInfo() {
5982
bRelease,
6083
bSdk,
6184
bFingerPrint,
62-
bID
85+
bID,
86+
bCPUABI,
87+
bCPUABI2,
88+
bCPU32List,
89+
bCPU64List,
90+
bABIS
6391
);
6492
}
6593

0 commit comments

Comments
 (0)