Merge "Remove unnecessary PROVIDER_CHANGED broadcast on launch" am: 40cc0c9c1d am: fbd34141a0 am: 304dba340c
am: c875e20fc4
Change-Id: I68809549936e3393bc91ae427cd100b164c3c8b4
diff --git a/src/com/android/providers/calendar/CalendarUpgradeReceiver.java b/src/com/android/providers/calendar/CalendarUpgradeReceiver.java
index 9402298..1f69f92 100644
--- a/src/com/android/providers/calendar/CalendarUpgradeReceiver.java
+++ b/src/com/android/providers/calendar/CalendarUpgradeReceiver.java
@@ -16,7 +16,6 @@
package com.android.providers.calendar;
-import android.app.ActivityManagerNative;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
diff --git a/tests/src/com/android/providers/calendar/CalendarProvider2Test.java b/tests/src/com/android/providers/calendar/CalendarProvider2Test.java
index 8694f6f..52cb8a3 100644
--- a/tests/src/com/android/providers/calendar/CalendarProvider2Test.java
+++ b/tests/src/com/android/providers/calendar/CalendarProvider2Test.java
@@ -2879,9 +2879,6 @@
public static final Uri PROPERTIES_CONTENT_URI =
Uri.parse("content://" + CalendarContract.AUTHORITY + "/properties");
- public static final int COLUMN_KEY_INDEX = 0;
- public static final int COLUMN_VALUE_INDEX = 1;
-
public void testGetProviderProperties() throws CalendarCache.CacheException {
CalendarDatabaseHelper helper = (CalendarDatabaseHelper) getProvider().getDatabaseHelper();
cleanCalendarDataTable(helper);
@@ -2895,14 +2892,13 @@
Cursor cursor = mResolver.query(PROPERTIES_CONTENT_URI, null, null, null, null);
assertEquals(4, cursor.getCount());
- assertEquals(CalendarCache.COLUMN_NAME_KEY, cursor.getColumnName(COLUMN_KEY_INDEX));
- assertEquals(CalendarCache.COLUMN_NAME_VALUE, cursor.getColumnName(COLUMN_VALUE_INDEX));
-
+ final int keyColumnIndex = cursor.getColumnIndex(CalendarCache.COLUMN_NAME_KEY);
+ final int valueColumnIndex = cursor.getColumnIndex(CalendarCache.COLUMN_NAME_VALUE);
Map<String, String> map = new HashMap<String, String>();
while (cursor.moveToNext()) {
- String key = cursor.getString(COLUMN_KEY_INDEX);
- String value = cursor.getString(COLUMN_VALUE_INDEX);
+ String key = cursor.getString(keyColumnIndex);
+ String value = cursor.getString(valueColumnIndex);
map.put(key, value);
}
@@ -2941,8 +2937,10 @@
assertEquals(1, cursor.getCount());
assertTrue(cursor.moveToFirst());
- assertEquals(cursor.getString(COLUMN_KEY_INDEX), key);
- assertEquals(cursor.getString(COLUMN_VALUE_INDEX), value);
+ assertEquals(cursor.getString(cursor.getColumnIndex(CalendarCache.COLUMN_NAME_KEY)),
+ key);
+ assertEquals(cursor.getString(cursor.getColumnIndex(CalendarCache.COLUMN_NAME_VALUE)),
+ value);
cursor.close();
}