Merge "Add new package aggregation.util"
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5dd88e4..402b8c1 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="sharedUserLabel" msgid="8024311725474286801">"Android 核心应用程序"</string>
+ <string name="sharedUserLabel" msgid="8024311725474286801">"Android 核心应用"</string>
<string name="app_label" msgid="3389954322874982620">"联系人存储"</string>
<string name="provider_label" msgid="6012150850819899907">"联系人"</string>
<string name="upgrade_msg" msgid="8640807392794309950">"正在升级联系人数据库。"</string>
@@ -26,6 +26,6 @@
<string name="default_directory" msgid="93961630309570294">"联系人"</string>
<string name="local_invisible_directory" msgid="705244318477396120">"其他"</string>
<string name="read_write_all_voicemail_label" msgid="4557216100818257560">"访问所有语音邮件"</string>
- <string name="read_write_all_voicemail_description" msgid="8029809937805761356">"允许应用程序存储和检索此设备可访问的所有语音邮件。"</string>
+ <string name="read_write_all_voicemail_description" msgid="8029809937805761356">"允许应用存储和检索此设备可访问的所有语音邮件。"</string>
<string name="voicemail_from_column" msgid="435732568832121444">"语音邮件发件人 "</string>
</resources>
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 032920b..7473718 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -58,6 +58,7 @@
import com.google.android.collect.Maps;
import com.google.android.collect.Sets;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
import android.accounts.Account;
import android.accounts.AccountManager;
@@ -5254,9 +5255,8 @@
}
case STREAM_ITEMS_LIMIT: {
- MatrixCursor cursor = new MatrixCursor(new String[]{StreamItems.MAX_ITEMS}, 1);
- cursor.addRow(new Object[]{MAX_STREAM_ITEMS_PER_RAW_CONTACT});
- return cursor;
+ return buildSingleRowResult(projection, new String[] {StreamItems.MAX_ITEMS},
+ new Object[] {MAX_STREAM_ITEMS_PER_RAW_CONTACT});
}
case STREAM_ITEMS_PHOTOS: {
@@ -5284,11 +5284,9 @@
}
case PHOTO_DIMENSIONS: {
- MatrixCursor cursor = new MatrixCursor(
- new String[]{DisplayPhoto.DISPLAY_MAX_DIM, DisplayPhoto.THUMBNAIL_MAX_DIM},
- 1);
- cursor.addRow(new Object[]{mMaxDisplayPhotoDim, mMaxThumbnailPhotoDim});
- return cursor;
+ return buildSingleRowResult(projection,
+ new String[] {DisplayPhoto.DISPLAY_MAX_DIM, DisplayPhoto.THUMBNAIL_MAX_DIM},
+ new Object[] {mMaxDisplayPhotoDim, mMaxThumbnailPhotoDim});
}
case PHONES:
@@ -5849,7 +5847,9 @@
}
case PROVIDER_STATUS: {
- return queryProviderStatus(uri, projection);
+ return buildSingleRowResult(projection,
+ new String[] {ProviderStatus.STATUS, ProviderStatus.DATA1},
+ new Object[] {mProviderStatus, mEstimatedStorageRequirement});
}
case DIRECTORIES : {
@@ -5909,21 +5909,6 @@
return c;
}
- /**
- * Creates a single-row cursor containing the current status of the provider.
- */
- private Cursor queryProviderStatus(Uri uri, String[] projection) {
- MatrixCursor cursor = new MatrixCursor(projection);
- RowBuilder row = cursor.newRow();
- for (int i = 0; i < projection.length; i++) {
- if (ProviderStatus.STATUS.equals(projection[i])) {
- row.add(mProviderStatus);
- } else if (ProviderStatus.DATA1.equals(projection[i])) {
- row.add(mEstimatedStorageRequirement);
- }
- }
- return cursor;
- }
/**
* Runs the query with the supplied contact ID and lookup ID. If the query succeeds,
@@ -8132,6 +8117,39 @@
}
/**
+ * Create a single row cursor for a simple, informational queries, such as
+ * {@link ProviderStatus#CONTENT_URI}.
+ */
+ @VisibleForTesting
+ static Cursor buildSingleRowResult(String[] projection, String[] availableColumns,
+ Object[] data) {
+ Preconditions.checkArgument(availableColumns.length == data.length);
+ if (projection == null) {
+ projection = availableColumns;
+ }
+ final MatrixCursor c = new MatrixCursor(projection, 1);
+ final RowBuilder row = c.newRow();
+
+ // It's O(n^2), but it's okay because we only have a few columns.
+ for (int i = 0; i < c.getColumnCount(); i++) {
+ final String column = c.getColumnName(i);
+
+ boolean found = false;
+ for (int j = 0; j < availableColumns.length; j++) {
+ if (availableColumns[j].equals(column)) {
+ row.add(data[j]);
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ throw new IllegalArgumentException("Invalid column " + projection[i]);
+ }
+ }
+ return c;
+ }
+
+ /**
* @return the currently active {@link ContactsDatabaseHelper} for the current thread.
*/
@NeededForTesting
diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index bef077c..c7f7dcb 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -6393,6 +6393,53 @@
cursor.close();
}
+ public void testBuildSingleRowResult() {
+ checkBuildSingleRowResult(
+ new String[] {"b"},
+ new String[] {"a", "b"},
+ new Integer[] {1, 2},
+ new Integer[] {2}
+ );
+
+ checkBuildSingleRowResult(
+ new String[] {"b", "a", "b"},
+ new String[] {"a", "b"},
+ new Integer[] {1, 2},
+ new Integer[] {2, 1, 2}
+ );
+
+ checkBuildSingleRowResult(
+ null, // all columns
+ new String[] {"a", "b"},
+ new Integer[] {1, 2},
+ new Integer[] {1, 2}
+ );
+
+ try {
+ // Access non-existent column
+ ContactsProvider2.buildSingleRowResult(new String[] {"a"}, new String[] {"b"},
+ new Object[] {1});
+ fail();
+ } catch (IllegalArgumentException expected) {
+ }
+ }
+
+ private void checkBuildSingleRowResult(String[] projection, String[] availableColumns,
+ Object[] data, Integer[] expectedValues) {
+ final Cursor c = ContactsProvider2.buildSingleRowResult(projection, availableColumns, data);
+ try {
+ assertTrue(c.moveToFirst());
+ assertEquals(1, c.getCount());
+ assertEquals(expectedValues.length, c.getColumnCount());
+
+ for (int i = 0; i < expectedValues.length; i++) {
+ assertEquals("column " + i, expectedValues[i], (Integer) c.getInt(i));
+ }
+ } finally {
+ c.close();
+ }
+ }
+
private Cursor queryGroupMemberships(Account account) {
Cursor c = mResolver.query(maybeAddAccountQueryParameters(Data.CONTENT_URI, account),
new String[]{GroupMembership.GROUP_ROW_ID, GroupMembership.RAW_CONTACT_ID},
diff --git a/tests/src/com/android/providers/contacts/PhotoStoreTest.java b/tests/src/com/android/providers/contacts/PhotoStoreTest.java
index 546f0a3..3d7f149 100644
--- a/tests/src/com/android/providers/contacts/PhotoStoreTest.java
+++ b/tests/src/com/android/providers/contacts/PhotoStoreTest.java
@@ -73,16 +73,21 @@
assertEquals(0, mPhotoStore.insert(new PhotoProcessor(photo, 256, 96)));
}
+ public void testStore200Photo() throws IOException {
+ // As 200 is below the full photo size, we don't want to see it upscaled
+ runStorageTestForResource(R.drawable.earth_200, 200);
+ }
+
public void testStoreMediumPhoto() throws IOException {
- runStorageTestForResource(R.drawable.earth_normal);
+ runStorageTestForResource(R.drawable.earth_normal, 256);
}
public void testStoreLargePhoto() throws IOException {
- runStorageTestForResource(R.drawable.earth_large);
+ runStorageTestForResource(R.drawable.earth_large, 256);
}
public void testStoreHugePhoto() throws IOException {
- runStorageTestForResource(R.drawable.earth_huge);
+ runStorageTestForResource(R.drawable.earth_huge, 256);
}
/**
@@ -100,7 +105,7 @@
* the size of the photo.
* @param resourceId The resource ID of the photo file to test.
*/
- public void runStorageTestForResource(int resourceId) throws IOException {
+ public void runStorageTestForResource(int resourceId, int expectedSize) throws IOException {
byte[] photo = loadPhotoFromResource(resourceId, PhotoSize.ORIGINAL);
long photoFileId = mPhotoStore.insert(new PhotoProcessor(photo, 256, 96));
assertTrue(photoFileId != 0);
@@ -118,8 +123,8 @@
try {
assertEquals(1, c.getCount());
c.moveToFirst();
- assertEquals(256, c.getInt(0));
- assertEquals(256, c.getInt(1));
+ assertEquals(expectedSize, c.getInt(0));
+ assertEquals(expectedSize, c.getInt(1));
assertEquals(expectedStoredVersion.length, c.getInt(2));
} finally {
c.close();