Handle null-safety errors for AOSP QPR2 (667e465b) · Commits · e / os / android_packages_apps_Etar

app/src/main/java/com/android/calendar/settings/CalendarDataStore.kt

+6 −6

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ class CalendarDataStore(activity: FragmentActivity, calendarId: Long) : Preferen
		}
		}

		override fun putBoolean(key: String?, value: Boolean) {
		override fun putBoolean(key: String, value: Boolean) {
		val databaseKey = mapPreferenceKeyToDatabaseKey(key)

		val values = ContentValues()
		@@ -59,7 +59,7 @@ class CalendarDataStore(activity: FragmentActivity, calendarId: Long) : Preferen
		contentResolver.update(calendarUri, values, null, null)
		}

		override fun getBoolean(key: String?, defValue: Boolean): Boolean {
		override fun getBoolean(key: String, defValue: Boolean): Boolean {
		val databaseKey = mapPreferenceKeyToDatabaseKey(key)

		contentResolver.query(calendarUri, PROJECTION, null, null, null)?.use {
		@@ -70,7 +70,7 @@ class CalendarDataStore(activity: FragmentActivity, calendarId: Long) : Preferen
		return defValue
		}

		override fun putInt(key: String?, value: Int) {
		override fun putInt(key: String, value: Int) {
		val databaseKey = mapPreferenceKeyToDatabaseKey(key)

		val values = ContentValues()
		@@ -78,7 +78,7 @@ class CalendarDataStore(activity: FragmentActivity, calendarId: Long) : Preferen
		contentResolver.update(calendarUri, values, null, null)
		}

		override fun getInt(key: String?, defValue: Int): Int {
		override fun getInt(key: String, defValue: Int): Int {
		val databaseKey = mapPreferenceKeyToDatabaseKey(key)

		contentResolver.query(calendarUri, PROJECTION, null, null, null)?.use {
		@@ -89,7 +89,7 @@ class CalendarDataStore(activity: FragmentActivity, calendarId: Long) : Preferen
		return defValue
		}

		override fun putString(key: String?, value: String?) {
		override fun putString(key: String, value: String?) {
		val databaseKey = mapPreferenceKeyToDatabaseKey(key)

		val values = ContentValues()
		@@ -97,7 +97,7 @@ class CalendarDataStore(activity: FragmentActivity, calendarId: Long) : Preferen
		contentResolver.update(calendarUri, values, null, null)
		}

		override fun getString(key: String?, defValue: String?): String? {
		override fun getString(key: String, defValue: String?): String? {
		val databaseKey = mapPreferenceKeyToDatabaseKey(key)

		contentResolver.query(calendarUri, PROJECTION, null, null, null)?.use {