Fix kotlin nullable errors in Permission tests
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.
Change-Id: I105b1ecf1ab177bd279a1b95ba95aa702c770c63
diff --git a/tests/apex/java/com/android/role/persistence/RolesPersistenceTest.kt b/tests/apex/java/com/android/role/persistence/RolesPersistenceTest.kt
index 1806f8e..be821f3 100644
--- a/tests/apex/java/com/android/role/persistence/RolesPersistenceTest.kt
+++ b/tests/apex/java/com/android/role/persistence/RolesPersistenceTest.kt
@@ -103,11 +103,11 @@
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 {
diff --git a/tests/cts/permissionui/PermissionPolicyApp25/src/android/permissionui/cts/permissionpolicy/TestProtectionFlagsActivity.kt b/tests/cts/permissionui/PermissionPolicyApp25/src/android/permissionui/cts/permissionpolicy/TestProtectionFlagsActivity.kt
index b5fea9b..35e61d0 100644
--- a/tests/cts/permissionui/PermissionPolicyApp25/src/android/permissionui/cts/permissionpolicy/TestProtectionFlagsActivity.kt
+++ b/tests/cts/permissionui/PermissionPolicyApp25/src/android/permissionui/cts/permissionpolicy/TestProtectionFlagsActivity.kt
@@ -40,7 +40,7 @@
private fun getProtectionFlagsErrorMessage(): String {
val packageInfo = packageManager.getPackageInfo("android", PackageManager.GET_PERMISSIONS)
val errorMessageBuilder = StringBuilder()
- for (declaredPermissionInfo in packageInfo.permissions) {
+ for (declaredPermissionInfo in packageInfo.permissions ?: emptyArray()) {
val permissionInfo = packageManager.getPermissionInfo(declaredPermissionInfo.name, 0)
val protection = permissionInfo.protection and (
PermissionInfo.PROTECTION_NORMAL
diff --git a/tests/cts/permissionui/UsePermissionAppLocationProvider/src/android/permissionui/cts/accessmicrophoneapplocationprovider/AddLocationProviderActivity.kt b/tests/cts/permissionui/UsePermissionAppLocationProvider/src/android/permissionui/cts/accessmicrophoneapplocationprovider/AddLocationProviderActivity.kt
index 759700a..e7977b4 100644
--- a/tests/cts/permissionui/UsePermissionAppLocationProvider/src/android/permissionui/cts/accessmicrophoneapplocationprovider/AddLocationProviderActivity.kt
+++ b/tests/cts/permissionui/UsePermissionAppLocationProvider/src/android/permissionui/cts/accessmicrophoneapplocationprovider/AddLocationProviderActivity.kt
@@ -28,7 +28,7 @@
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val attrContext = createAttributionContext("test.tag")
- val locationManager = attrContext.getSystemService(LocationManager::class.java)
+ val locationManager = attrContext.getSystemService(LocationManager::class.java)!!
locationManager.addTestProvider(
packageName, false, false, false, false, false, false, false, Criteria.POWER_LOW,
Criteria.ACCURACY_COARSE
