commit 8b891a52a0a29d3b6305bb89b35920a6d3a19bc9
author Bill Rassieur <rassb@google.com> Wed Apr 03 18:10:42 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 03 18:10:42 2019 -0700
tree cc0d4ac571ce03df3db9085ace502ac1d8e5e884
parent 232ac2b689eb2531a75f707635233809910c5999
parent f8e5c2f0413c8fd9883b83597e74d460d1c760ef

Merge master@5406228 into git_qt-dev-plus-aosp.
am: f8e5c2f041

Change-Id: I6b93281378a7463bd5d884cab31a012b60c1cf71

src/com/android/providers/calendar/CalendarDatabaseHelper.java

diff --git a/src/com/android/providers/calendar/CalendarDatabaseHelper.java b/src/com/android/providers/calendar/CalendarDatabaseHelper.java
index 6c8662b..1e2b986 100644
--- a/src/com/android/providers/calendar/CalendarDatabaseHelper.java
+++ b/src/com/android/providers/calendar/CalendarDatabaseHelper.java
@@ -74,7 +74,7 @@
     // 5xx for JB MR1
     // 6xx for K
     // Bump this to the next hundred at each major release.
-    static final int DATABASE_VERSION = 600;
+    static final int DATABASE_VERSION = 601;
 
     private static final int PRE_FROYO_SYNC_STATE_VERSION = 3;
 
@@ -1412,6 +1412,11 @@
                 createEventsView = true; // This is needed if the calendars or events schema changed
                 oldVersion = 600;
             }
+            if (oldVersion < 601) {
+                // There are no table changes in 601, but recreating the events view is required
+                createEventsView = true;
+                oldVersion = 601;
+            }
 
             if (createEventsView) {
                 createEventsView(db);

src/com/android/providers/calendar/CalendarProvider2.java

diff --git a/src/com/android/providers/calendar/CalendarProvider2.java b/src/com/android/providers/calendar/CalendarProvider2.java
index c856f9d..b5783fd 100644
--- a/src/com/android/providers/calendar/CalendarProvider2.java
+++ b/src/com/android/providers/calendar/CalendarProvider2.java
@@ -4321,8 +4321,6 @@
                     }
 
                     if (events.getCount() == 0) {
-                        Log.i(TAG, "No events to update: uri=" + uri + " selection=" + selection +
-                                " selectionArgs=" + Arrays.toString(selectionArgs));
                         return 0;
                     }