aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleh Cherpak <oleh.cherpak@globallogic.com>2019-02-12 15:43:33 +0200
committerKarthik Ramakrishnan <karthikmr@google.com>2019-02-16 02:15:27 +0000
commit715532f8ab7568cd8a896b8aff9a13140b48849d (patch)
treeeed31f2f6eb3709741e3996841c7750885df9f73
parent6a5c1b5cdd1c4ce64143023fa7dbdf7fc7d06a22 (diff)
downloadCar-715532f8ab7568cd8a896b8aff9a13140b48849d.tar.gz
Fix operators priority to prevent NullPointerException
test: run cts -m CtsIncidentHostTestCases Signed-off-by: Oleh Cherpak <oleh.cherpak@globallogic.com> Change-Id: Icfe1f40051fa084b248153f29d1bf0359eea8b61 Merged-In: Icfe1f40051fa084b248153f29d1bf0359eea8b61
-rw-r--r--service/src/com/android/car/pm/CarPackageManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/service/src/com/android/car/pm/CarPackageManagerService.java b/service/src/com/android/car/pm/CarPackageManagerService.java
index ed51a78269..41b71a7768 100644
--- a/service/src/com/android/car/pm/CarPackageManagerService.java
+++ b/service/src/com/android/car/pm/CarPackageManagerService.java
@@ -607,7 +607,7 @@ public class CarPackageManagerService extends ICarPackageManager.Stub implements
&& !mAllowedAppInstallSources.contains(installerName))) {
Log.w(CarLog.TAG_PACKAGE,
info.packageName + " not installed from permitted sources "
- + installerName == null ? "NULL" : installerName);
+ + (installerName == null ? "NULL" : installerName));
continue;
}
}