Merge "Don't cache results of permission check" into mnc-dev
diff --git a/src/com/android/contacts/common/activity/RequestImportVCardPermissionsActivity.java b/src/com/android/contacts/common/activity/RequestImportVCardPermissionsActivity.java
index 831f6f3..f3baf0b 100644
--- a/src/com/android/contacts/common/activity/RequestImportVCardPermissionsActivity.java
+++ b/src/com/android/contacts/common/activity/RequestImportVCardPermissionsActivity.java
@@ -26,6 +26,7 @@
private static final String[] REQUIRED_PERMISSIONS = new String[] {
permission.READ_CONTACTS,
+ permission.READ_EXTERNAL_STORAGE,
};
@Override
diff --git a/src/com/android/contacts/common/model/account/BaseAccountType.java b/src/com/android/contacts/common/model/account/BaseAccountType.java
index 262a939..7526f0c 100644
--- a/src/com/android/contacts/common/model/account/BaseAccountType.java
+++ b/src/com/android/contacts/common/model/account/BaseAccountType.java
@@ -427,6 +427,7 @@
kind.fieldList = Lists.newArrayList();
kind.fieldList.add(new EditField(SipAddress.SIP_ADDRESS,
R.string.label_sip_address, FLAGS_SIP_ADDRESS));
+ kind.typeOverallMax = 1;
return kind;
}
diff --git a/tests/src/com/android/contacts/common/model/account/ExternalAccountTypeTest.java b/tests/src/com/android/contacts/common/model/account/ExternalAccountTypeTest.java
index 7e799f2..d508e0f 100644
--- a/tests/src/com/android/contacts/common/model/account/ExternalAccountTypeTest.java
+++ b/tests/src/com/android/contacts/common/model/account/ExternalAccountTypeTest.java
@@ -69,27 +69,13 @@
}
/**
- * Initialize with an invalid package name and see if type type will *not* be initialized.
+ * Initialize with an invalid package name and see if type will be initialized, but empty.
*/
public void testNoPackage() {
final ExternalAccountType type = new ExternalAccountType(getContext(),
"!!!no such package name!!!", false);
- assertFalse(type.isInitialized());
- }
-
- /**
- * Initialize with the name of an existing package, which has no contacts.xml metadata.
- */
- /*
- public void testNoMetadata() {
- // Use the main application package, which does exist, but has no contacts.xml in it.
- String packageName = getContext().getPackageName();
- Log.e("TEST", packageName);
- final ExternalAccountType type = new ExternalAccountType(getContext(),
- packageName, false);
assertTrue(type.isInitialized());
}
- */
/**
* Initialize with the test package itself and see if EditSchema is correctly parsed.