Prevent crash

pull/164/head
M66B 5 years ago
parent 62a4fba00d
commit e943593035

@ -30,6 +30,7 @@ import android.net.ConnectivityManager;
import android.net.Network; import android.net.Network;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.os.BadParcelableException;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.DeadObjectException; import android.os.DeadObjectException;
@ -320,28 +321,33 @@ public class Log {
if (data == null) if (data == null)
return result; return result;
Set<String> keys = data.keySet(); try {
for (String key : keys) { Set<String> keys = data.keySet();
Object v = data.get(key); for (String key : keys) {
Object v = data.get(key);
Object value = v;
if (v != null && v.getClass().isArray()) { Object value = v;
int length = Array.getLength(v); if (v != null && v.getClass().isArray()) {
if (length <= 10) { int length = Array.getLength(v);
String[] elements = new String[length]; if (length <= 10) {
for (int i = 0; i < length; i++) { String[] elements = new String[length];
Object element = Array.get(v, i); for (int i = 0; i < length; i++) {
if (element instanceof Long) Object element = Array.get(v, i);
elements[i] = "0x" + Long.toHexString((Long) element); if (element instanceof Long)
else elements[i] = "0x" + Long.toHexString((Long) element);
elements[i] = (element == null ? null : element.toString()); else
elements[i] = (element == null ? null : element.toString());
}
value = TextUtils.join(",", elements);
} }
value = TextUtils.join(",", elements); } else if (v instanceof Long)
} value = "0x" + Long.toHexString((Long) v);
} else if (v instanceof Long)
value = "0x" + Long.toHexString((Long) v);
result.add(key + "=" + value + (value == null ? "" : " (" + v.getClass().getSimpleName() + ")")); result.add(key + "=" + value + (value == null ? "" : " (" + v.getClass().getSimpleName() + ")"));
}
} catch (BadParcelableException ex) {
// android.os.BadParcelableException: ClassNotFoundException when unmarshalling: ...
Log.e(ex);
} }
return result; return result;

Loading…
Cancel
Save