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

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

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