Skip to content

Commit 80a6d00

Browse files
authored
Fix potential NPE while using CarUxRestrictionsManager (#6170)
1 parent 59db725 commit 80a6d00

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

app/src/main/kotlin/io/homeassistant/companion/android/BaseActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ open class BaseActivity : AppCompatActivity() {
5959
if (isAutomotive()) {
6060
car = Car.createCar(this)
6161
carRestrictionManager =
62-
car?.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE) as CarUxRestrictionsManager
62+
car?.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE) as? CarUxRestrictionsManager
6363
val listener =
6464
CarUxRestrictionsManager.OnUxRestrictionsChangedListener { restrictions ->
6565
if (restrictions.isRequiresDistractionOptimization) {

app/src/main/kotlin/io/homeassistant/companion/android/vehicle/BaseVehicleScreen.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ abstract class BaseVehicleScreen(carContext: CarContext) : Screen(carContext) {
1414
private var carRestrictionManager: CarUxRestrictionsManager? = null
1515
protected val isDrivingOptimized
1616
get() = try {
17-
car?.let {
18-
(
19-
it.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE) as CarUxRestrictionsManager
20-
).currentCarUxRestrictions.isRequiresDistractionOptimization
21-
} ?: false
17+
(car?.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE) as? CarUxRestrictionsManager)
18+
?.currentCarUxRestrictions
19+
?.isRequiresDistractionOptimization
20+
?: false
2221
} catch (e: Exception) {
2322
Timber.e(e, "Error getting UX Restrictions")
2423
false
@@ -46,7 +45,7 @@ abstract class BaseVehicleScreen(carContext: CarContext) : Screen(carContext) {
4645
Timber.i("Register for Automotive Restrictions")
4746
car = Car.createCar(carContext)
4847
carRestrictionManager =
49-
car?.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE) as CarUxRestrictionsManager
48+
car?.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE) as? CarUxRestrictionsManager
5049
val listener =
5150
CarUxRestrictionsManager.OnUxRestrictionsChangedListener { restrictions ->
5251
onDrivingOptimizedChanged(restrictions.isRequiresDistractionOptimization)

0 commit comments

Comments
 (0)