danog/termux-api
1
0
Fork 0
mirror of https://github.com/danog/termux-api.git synced 2024-11-30 04:19:20 +01:00
Code Issues Projects Releases Wiki Activity

termux-telephony-deviceinfo: SDK 29 compatibility

Browse Source 
Fixes https://github.com/termux/termux-api/issues/362.
This commit is contained in:
Leonid Pliushch 2020-09-30 18:31:23 +03:00
parent 61cba9390e
commit 19229ad1ac
No known key found for this signature in database
GPG Key ID: 45F2964132545795
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/com/termux/api/TelephonyAPI.java
View File

@ -169,7 +169,15 @@ public class TelephonyAPI {
int phoneType = manager.getPhoneType();
String device_id = phoneType == TelephonyManager.PHONE_TYPE_GSM ? manager.getImei() : manager.getMeid();
String device_id = null;
try {
device_id = phoneType == TelephonyManager.PHONE_TYPE_GSM ? manager.getImei() : manager.getMeid();
} catch (SecurityException e) {
// Failed to obtain device id.
// Android 10+.
}
out.name("device_id").value(device_id);
out.name("device_software_version").value(manager.getDeviceSoftwareVersion());
@ -256,12 +264,22 @@ public class TelephonyAPI {
}
out.name("network_type").value(networkTypeName);
out.name("network_roaming").value(manager.isNetworkRoaming());
out.name("sim_country_iso").value(manager.getSimCountryIso());
out.name("sim_operator").value(manager.getSimOperator());
out.name("sim_operator_name").value(manager.getSimOperatorName());
out.name("sim_serial_number").value(manager.getSimSerialNumber());
out.name("sim_subscriber_id").value(manager.getSubscriberId());
String sim_serial = null;
String subscriber_id = null;
try {
sim_serial = manager.getSimSerialNumber();
subscriber_id = manager.getSubscriberId();
} catch (SecurityException e) {
// Failed to obtain device id.
// Android 10+.
}
out.name("sim_serial_number").value(sim_serial);
out.name("sim_subscriber_id").value(subscriber_id);
int simState = manager.getSimState();
String simStateString;
switch (simState) {
@ -288,8 +306,6 @@ public class TelephonyAPI {
break;
}
out.name("sim_state").value(simStateString);
}
out.endObject();