diff options
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/auto/DrivingDecisionReminderService.kt | 35 | ||||
| -rw-r--r-- | tests/apex/java/com/android/role/persistence/RolesPersistenceTest.kt | 10 |
2 files changed, 25 insertions, 20 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/auto/DrivingDecisionReminderService.kt b/PermissionController/src/com/android/permissioncontroller/auto/DrivingDecisionReminderService.kt index b2cf75fed..7a2d5d570 100644 --- a/PermissionController/src/com/android/permissioncontroller/auto/DrivingDecisionReminderService.kt +++ b/PermissionController/src/com/android/permissioncontroller/auto/DrivingDecisionReminderService.kt @@ -112,21 +112,26 @@ class DrivingDecisionReminderService : Service() { ready: Boolean -> // just give up if we can't connect to the car if (ready) { - val restrictionsManager = - car.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE) - as CarUxRestrictionsManager - if ( - restrictionsManager.currentCarUxRestrictions - .isRequiresDistractionOptimization - ) { - context.startService( - createIntent( - context, - packageName, - permGroupName, - Process.myUserHandle() - ) - ) + val restrictionsManager = car.getCarManager( + Car.CAR_UX_RESTRICTION_SERVICE) as CarUxRestrictionsManager? + if (restrictionsManager != null) { + val currentCarUxRestrictions = restrictionsManager.currentCarUxRestrictions + if (currentCarUxRestrictions != null) { + if (currentCarUxRestrictions.isRequiresDistractionOptimization) { + context.startService( + createIntent( + context, + packageName, + permGroupName, + Process.myUserHandle())) + } + } else { + DumpableLog.e(LOG_TAG, + "Reminder service not created because CarUxRestrictions is null") + } + } else { + DumpableLog.e(LOG_TAG, + "Reminder service not created because CarUxRestrictionsManager is null") } } car.disconnect() diff --git a/tests/apex/java/com/android/role/persistence/RolesPersistenceTest.kt b/tests/apex/java/com/android/role/persistence/RolesPersistenceTest.kt index 1806f8e13..d90ffade9 100644 --- a/tests/apex/java/com/android/role/persistence/RolesPersistenceTest.kt +++ b/tests/apex/java/com/android/role/persistence/RolesPersistenceTest.kt @@ -91,7 +91,7 @@ class RolesPersistenceTest { .writeText("<roles version=\"-1\"><role name=\"com.foo.bar\"><holder") val persistedState = persistence.readForUser(user) - checkPersistedState(persistedState!!) + checkPersistedState(persistedState) } @Test @@ -103,11 +103,11 @@ class RolesPersistenceTest { assertThat(persistedState).isNull() } - private fun checkPersistedState(persistedState: RolesState) { + private fun checkPersistedState(persistedState: RolesState?) { assertThat(persistedState).isEqualTo(state) - assertThat(persistedState.version).isEqualTo(state.version) - assertThat(persistedState.packagesHash).isEqualTo(state.packagesHash) - assertThat(persistedState.roles).isEqualTo(state.roles) + assertThat(persistedState?.version).isEqualTo(state.version) + assertThat(persistedState?.packagesHash).isEqualTo(state.packagesHash) + assertThat(persistedState?.roles).isEqualTo(state.roles) } companion object { |