Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid a couple possible NullPointerExceptions

Browse Source
This commit is contained in:
Daniel Martí 2013-12-12 00:19:53 +01:00
parent 10fa5108da
commit 00a0f4399f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/fdroid/fdroid/DB.java
View File

@ -378,11 +378,13 @@ public class DB {
StringBuilder logMsg = new StringBuilder(); StringBuilder logMsg = new StringBuilder();
logMsg.append("Available device features:"); logMsg.append("Available device features:");
features = new HashSet<String>(); features = new HashSet<String>();
if (pm != null) {
for (FeatureInfo fi : pm.getSystemAvailableFeatures()) { for (FeatureInfo fi : pm.getSystemAvailableFeatures()) {
features.add(fi.name); features.add(fi.name);
logMsg.append('\n'); logMsg.append('\n');
logMsg.append(fi.name); logMsg.append(fi.name);
} }
}
cpuAbis = new ArrayList<String>(); cpuAbis = new ArrayList<String>();
if (hasApi(8)) if (hasApi(8))
@ -866,8 +868,10 @@ public class DB {
if (app.installedVersion == null) if (app.installedVersion == null)
app.installedVersion = "null"; app.installedVersion = "null";
app.installedVerCode = sysapk.versionCode; app.installedVerCode = sysapk.versionCode;
if (sysapk.applicationInfo != null) {
app.userInstalled = ((sysapk.applicationInfo.flags app.userInstalled = ((sysapk.applicationInfo.flags
& ApplicationInfo.FLAG_SYSTEM) != 1); & ApplicationInfo.FLAG_SYSTEM) != 1);
}
} else { } else {
app.installedVersion = null; app.installedVersion = null;
app.installedVerCode = 0; app.installedVerCode = 0;