diff options
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | OWNERS | 2 | ||||
| -rw-r--r-- | src/com/android/calendar/AllInOneActivity.kt | 2 | ||||
| -rw-r--r-- | src/com/android/calendar/DayView.kt | 12 | ||||
| -rw-r--r-- | src/com/android/calendar/GeneralPreferences.kt | 2 | ||||
| -rw-r--r-- | src/com/android/calendar/alerts/AlertUtils.kt | 4 | ||||
| -rw-r--r-- | src/com/android/calendar/widget/CalendarAppWidgetService.kt | 6 | ||||
| -rw-r--r-- | tests/Android.bp | 37 | ||||
| -rw-r--r-- | tests/Android.mk | 25 |
9 files changed, 52 insertions, 40 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fed61b0c..3bf3a894 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -37,7 +37,7 @@ <uses-permission android:name="android.permission.USE_CREDENTIALS" /> <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> - <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.mail" /> + <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.mail" android:maxSdkVersion="34"/> <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30"></uses-sdk> @@ -1,3 +1,5 @@ # This project has no significant updates recently. # Please update this list if you find better candidates. rtenneti@google.com +delphij@google.com +spickl@google.com diff --git a/src/com/android/calendar/AllInOneActivity.kt b/src/com/android/calendar/AllInOneActivity.kt index b3b45fc1..d6767f04 100644 --- a/src/com/android/calendar/AllInOneActivity.kt +++ b/src/com/android/calendar/AllInOneActivity.kt @@ -683,7 +683,7 @@ class AllInOneActivity : Activity(), EventHandler, OnSharedPreferenceChangeListe } @Override - override fun onSharedPreferenceChanged(prefs: SharedPreferences?, key: String) { + override fun onSharedPreferenceChanged(prefs: SharedPreferences, key: String?) { if (key.equals(GeneralPreferences.KEY_WEEK_START_DAY)) { if (mPaused) { mUpdateOnResume = true diff --git a/src/com/android/calendar/DayView.kt b/src/com/android/calendar/DayView.kt index 84ad5833..d5f4f483 100644 --- a/src/com/android/calendar/DayView.kt +++ b/src/com/android/calendar/DayView.kt @@ -2796,7 +2796,7 @@ class DayView( performLongClick() } - private fun doScroll(e1: MotionEvent, e2: MotionEvent, deltaX: Float, deltaY: Float) { + private fun doScroll(e1: MotionEvent?, e2: MotionEvent, deltaX: Float, deltaY: Float) { cancelAnimation() if (mStartingScroll) { mInitialScrollX = 0f @@ -2909,7 +2909,7 @@ class DayView( } } - private fun doFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float) { + private fun doFling(e1: MotionEvent?, e2: MotionEvent, velocityX: Float, velocityY: Float) { cancelAnimation() mSelectionMode = SELECTION_HIDDEN eventClickCleanup() @@ -2919,7 +2919,7 @@ class DayView( // initNextView(deltaX); mTouchMode = TOUCH_MODE_INITIAL_STATE if (DEBUG) Log.d(TAG, "doFling: velocityX $velocityX") - val deltaX = e2.getX().toInt() - e1.getX().toInt() + val deltaX = e2.getX().toInt() - e1!!.getX().toInt() switchViews(deltaX < 0, mViewStartX.toFloat(), mViewWidth.toFloat(), velocityX) mViewStartX = 0 return @@ -3526,7 +3526,7 @@ class DayView( @Override override fun onScroll( - e1: MotionEvent, + e1: MotionEvent?, e2: MotionEvent, distanceX: Float, distanceY: Float @@ -3550,7 +3550,7 @@ class DayView( @Override override fun onFling( - e1: MotionEvent, + e1: MotionEvent?, e2: MotionEvent, velocityX: Float, velocityY: Float @@ -3987,4 +3987,4 @@ class DayView( OVERFLING_DISTANCE = vc.getScaledOverflingDistance() init(context as Context) } -}
\ No newline at end of file +} diff --git a/src/com/android/calendar/GeneralPreferences.kt b/src/com/android/calendar/GeneralPreferences.kt index 9406eff6..4044ef1b 100644 --- a/src/com/android/calendar/GeneralPreferences.kt +++ b/src/com/android/calendar/GeneralPreferences.kt @@ -172,7 +172,7 @@ class GeneralPreferences : PreferenceFragment(), OnSharedPreferenceChangeListene } @Override - override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String) { + override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) { val a: Activity = getActivity() if (key.equals(KEY_ALERTS)) { updateChildPreferences() diff --git a/src/com/android/calendar/alerts/AlertUtils.kt b/src/com/android/calendar/alerts/AlertUtils.kt index 18b7e7d1..21b2be04 100644 --- a/src/com/android/calendar/alerts/AlertUtils.kt +++ b/src/com/android/calendar/alerts/AlertUtils.kt @@ -53,9 +53,9 @@ object AlertUtils { return object : AlarmManagerInterface { override operator fun set(type: Int, triggerAtMillis: Long, operation: PendingIntent?) { if (com.android.calendar.Utils.isKeyLimePieOrLater()) { - mgr.setExact(type, triggerAtMillis, operation) + mgr.setExact(type, triggerAtMillis, operation!!) } else { - mgr.set(type, triggerAtMillis, operation) + mgr.set(type, triggerAtMillis, operation!!) } } } diff --git a/src/com/android/calendar/widget/CalendarAppWidgetService.kt b/src/com/android/calendar/widget/CalendarAppWidgetService.kt index 0d1018f3..26ed563c 100644 --- a/src/com/android/calendar/widget/CalendarAppWidgetService.kt +++ b/src/com/android/calendar/widget/CalendarAppWidgetService.kt @@ -504,9 +504,7 @@ class CalendarAppWidgetService : RemoteViewsService() { if (matrixCursor != null) { matrixCursor.close() } - if (cursor != null) { - cursor.close() - } + cursor.close() } // Schedule an alarm to wake ourselves up for the next update. @@ -662,4 +660,4 @@ class CalendarAppWidgetService : RemoteViewsService() { } } } -}
\ No newline at end of file +} diff --git a/tests/Android.bp b/tests/Android.bp new file mode 100644 index 00000000..f4f85055 --- /dev/null +++ b/tests/Android.bp @@ -0,0 +1,37 @@ +// Copyright 2023 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + default_team: "trendy_team_aosp", + // See: http://go/android-license-faq + default_applicable_licenses: [ + "packages_apps_Calendar_license", + ], +} + +android_test { + name: "CalendarTests", + jacoco: { + include_filter: ["com.android.calendar.*"], + }, + srcs: ["src/**/*.java"], + instrumentation_for: "Calendar", + // unbundled + static_libs: ["android-common"], + sdk_version: "16", + // Test needed artifacts + data: [ + ":Calendar", + ], +} diff --git a/tests/Android.mk b/tests/Android.mk deleted file mode 100644 index 2d74b1ee..00000000 --- a/tests/Android.mk +++ /dev/null @@ -1,25 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.calendar.* - -# We only want this apk build for tests. -LOCAL_MODULE_TAGS := tests - -LOCAL_STATIC_JAVA_LIBRARIES := android.test.runner - -# Include all test java files. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := CalendarTests -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE - -LOCAL_INSTRUMENTATION_FOR := Calendar - -# unbundled -LOCAL_STATIC_JAVA_LIBRARIES := android-common -LOCAL_SDK_VERSION := 16 - -include $(BUILD_PACKAGE) |