Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE
Change-Id: I1753a6211411ee253a8ab3362c3ac252c1ebca6e
diff --git a/src/com/android/providers/contacts/AccountWithDataSet.java b/src/com/android/providers/contacts/AccountWithDataSet.java
old mode 100644
new mode 100755
index bfae112..b483909
--- a/src/com/android/providers/contacts/AccountWithDataSet.java
+++ b/src/com/android/providers/contacts/AccountWithDataSet.java
@@ -25,7 +25,10 @@
* Account information that includes the data set, if any.
*/
public class AccountWithDataSet {
- public static final AccountWithDataSet LOCAL = new AccountWithDataSet(null, null, null);
+ public static final String PHONE_NAME = "PHONE";
+ public static final String ACCOUNT_TYPE_PHONE = "com.android.localphone";
+ public static final AccountWithDataSet LOCAL = new AccountWithDataSet(
+ PHONE_NAME, ACCOUNT_TYPE_PHONE, null);
private final String mAccountName;
private final String mAccountType;
@@ -62,7 +65,7 @@
}
public boolean isLocalAccount() {
- return (mAccountName == null) && (mAccountType == null);
+ return (PHONE_NAME.equals(mAccountName)) && (ACCOUNT_TYPE_PHONE.equals(mAccountType));
}
@Override
diff --git a/src/com/android/providers/contacts/CallLogProvider.java b/src/com/android/providers/contacts/CallLogProvider.java
old mode 100644
new mode 100755
index d4339b0..8589b9d
--- a/src/com/android/providers/contacts/CallLogProvider.java
+++ b/src/com/android/providers/contacts/CallLogProvider.java
@@ -19,7 +19,6 @@
import static com.android.providers.contacts.util.DbQueryUtils.checkForSupportedColumns;
import static com.android.providers.contacts.util.DbQueryUtils.getEqualityClause;
import static com.android.providers.contacts.util.DbQueryUtils.getInequalityClause;
-
import android.app.AppOpsManager;
import android.content.ContentProvider;
import android.content.ContentUris;
@@ -46,7 +45,6 @@
import com.android.providers.contacts.ContactsDatabaseHelper.Tables;
import com.android.providers.contacts.util.SelectionBuilder;
import com.android.providers.contacts.util.UserUtils;
-
import com.google.common.annotations.VisibleForTesting;
import java.util.HashMap;
@@ -75,6 +73,7 @@
Calls.FEATURES,
Calls.DATE,
Calls.DURATION,
+ Calls.DURATION_TYPE,
Calls.DATA_USAGE,
Calls.PHONE_ACCOUNT_COMPONENT_NAME,
Calls.PHONE_ACCOUNT_ID
@@ -103,6 +102,7 @@
sCallsProjectionMap.put(Calls.NUMBER_PRESENTATION, Calls.NUMBER_PRESENTATION);
sCallsProjectionMap.put(Calls.DATE, Calls.DATE);
sCallsProjectionMap.put(Calls.DURATION, Calls.DURATION);
+ sCallsProjectionMap.put(Calls.DURATION_TYPE, Calls.DURATION_TYPE);
sCallsProjectionMap.put(Calls.DATA_USAGE, Calls.DATA_USAGE);
sCallsProjectionMap.put(Calls.TYPE, Calls.TYPE);
sCallsProjectionMap.put(Calls.FEATURES, Calls.FEATURES);
@@ -345,6 +345,10 @@
case CALLS:
return getDatabaseModifier(db).delete(Tables.CALLS,
selectionBuilder.build(), selectionArgs);
+ case CALLS_ID:
+ return getDatabaseModifier(db).delete(Tables.CALLS,
+ new SelectionBuilder(Calls._ID + "=?").build(),
+ new String[] { uri.getLastPathSegment() });
default:
throw new UnsupportedOperationException("Cannot delete that URL: " + uri);
}
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
old mode 100644
new mode 100755
index e1a47cb..cc3deb8
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -332,9 +332,8 @@
"(SELECT " + AccountsColumns._ID +
" FROM " + Tables.ACCOUNTS +
" WHERE " +
- AccountsColumns.ACCOUNT_NAME + " IS NULL AND " +
- AccountsColumns.ACCOUNT_TYPE + " IS NULL AND " +
- AccountsColumns.DATA_SET + " IS NULL)";
+ AccountsColumns.ACCOUNT_TYPE + "='" +
+ AccountWithDataSet.ACCOUNT_TYPE_PHONE + "')";
final String RAW_CONTACT_IS_LOCAL = RawContactsColumns.CONCRETE_ACCOUNT_ID
+ "=" + LOCAL_ACCOUNT_ID;
@@ -1476,6 +1475,8 @@
Calls.PRESENTATION_ALLOWED + "," +
Calls.DATE + " INTEGER," +
Calls.DURATION + " INTEGER," +
+ Calls.DURATION_TYPE + " INTEGER NOT NULL DEFAULT " +
+ Calls.DURATION_TYPE_ACTIVE + "," +
Calls.DATA_USAGE + " INTEGER," +
Calls.TYPE + " INTEGER," +
Calls.FEATURES + " INTEGER NOT NULL DEFAULT 0," +
@@ -1971,13 +1972,18 @@
String contactsSelect = "SELECT "
+ ContactsColumns.CONCRETE_ID + " AS " + Contacts._ID + ","
+ contactsColumns + ", "
+ + AccountsColumns.ACCOUNT_NAME + ", "
+ + AccountsColumns.ACCOUNT_TYPE + ", "
+ buildDisplayPhotoUriAlias(ContactsColumns.CONCRETE_ID, Contacts.PHOTO_URI) + ", "
+ buildThumbnailPhotoUriAlias(ContactsColumns.CONCRETE_ID,
Contacts.PHOTO_THUMBNAIL_URI) + ", "
+ dbForProfile() + " AS " + Contacts.IS_USER_PROFILE
+ " FROM " + Tables.CONTACTS
+ " JOIN " + Tables.RAW_CONTACTS + " AS name_raw_contact ON("
- + Contacts.NAME_RAW_CONTACT_ID + "=name_raw_contact." + RawContacts._ID + ")";
+ + Contacts.NAME_RAW_CONTACT_ID + "=name_raw_contact." + RawContacts._ID + ")"
+ + " JOIN " + Tables.ACCOUNTS + " AS name_accounts ON("
+ + "name_raw_contact." + RawContactsColumns.ACCOUNT_ID + "=name_accounts."
+ + AccountsColumns._ID + ")";
db.execSQL("CREATE VIEW " + Views.CONTACTS + " AS " + contactsSelect);
@@ -2745,6 +2751,11 @@
oldVersion = 804;
}
+ if (oldVersion < 810) {
+ upgradeToVersion810(db);
+ oldVersion = 810;
+ }
+
if (oldVersion < 900) {
upgradeViewsAndTriggers = true;
oldVersion = 900;
@@ -4106,6 +4117,16 @@
ContactsContract.PinnedPositions.UNPINNED + ";");
}
+ private void upgradeToVersion810(SQLiteDatabase db) {
+ try {
+ db.execSQL("ALTER TABLE " + Tables.CALLS + " ADD " + Calls.DURATION_TYPE
+ + " INTEGER NOT NULL DEFAULT " + Calls.DURATION_TYPE_ACTIVE + ";");
+ } catch (SQLException e) {
+ Log.w(TAG, "Exception upgrading contacts2.db to 810 " + e);
+ }
+ }
+
+
private void upgradeToVersion902(SQLiteDatabase db) {
// adding account identifier to call log table
db.execSQL("ALTER TABLE calls ADD subscription_component_name TEXT;");
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index f36bed8..be3a497 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -283,6 +283,7 @@
private static final String FREQUENT_ORDER_BY = DataUsageStatColumns.TIMES_USED + " DESC,"
+ Contacts.DISPLAY_NAME + " COLLATE LOCALIZED ASC";
+ private static String WITHOUT_SIM_FLAG = "no_sim";
private static final int CONTACTS = 1000;
private static final int CONTACTS_ID = 1001;
@@ -751,6 +752,8 @@
.add(Contacts.IS_USER_PROFILE)
.addAll(sContactsColumns)
.addAll(sContactsPresenceColumns)
+ .add(RawContacts.ACCOUNT_TYPE)
+ .add(RawContacts.ACCOUNT_NAME)
.build();
/** Contains just the contacts columns */
@@ -896,6 +899,7 @@
.addAll(sDataColumns)
.addAll(sDataPresenceColumns)
.addAll(sContactsColumns)
+ .addAll(sRawContactColumns)
.addAll(sContactPresenceColumns)
.addAll(sDataUsageColumns)
.build();
@@ -7156,6 +7160,58 @@
StringBuilder sb = new StringBuilder();
sb.append(Views.CONTACTS);
+ /* Do not show contacts when SIM card is disabled for CONTACTS_FILTER */
+ StringBuilder sbWhere = new StringBuilder();
+ String withoutSim = getQueryParameter(uri, WITHOUT_SIM_FLAG);
+ if ("true".equals(withoutSim)) {
+ final long[] accountId = getAccountIdWithoutSim(uri);
+ if (accountId == null) {
+ // No such account.
+ sbWhere.setLength(0);
+ sbWhere.append("(1=2)");
+ } else {
+ if (accountId.length > 0) {
+ sbWhere.append(" (" + Contacts._ID + " not IN (" + "SELECT "
+ + RawContacts.CONTACT_ID + " FROM "
+ + Tables.RAW_CONTACTS + " WHERE "
+ + RawContacts.CONTACT_ID + " not NULL AND ( ");
+ for (int i = 0; i < accountId.length; i++) {
+ sbWhere.append(RawContactsColumns.ACCOUNT_ID + "="
+ + accountId[i]);
+ if (i != accountId.length - 1) {
+ sbWhere.append(" OR ");
+ }
+ }
+ sbWhere.append(")))");
+ }
+ }
+ } else {
+ final AccountWithDataSet accountWithDataSet = getAccountWithDataSetFromUri(uri);
+ // Accounts are valid by only checking one parameter, since we've
+ // already ruled out partial accounts.
+ final boolean validAccount = !TextUtils.isEmpty(accountWithDataSet.getAccountName());
+ if (validAccount) {
+ final Long accountId = mDbHelper.get().getAccountIdOrNull(accountWithDataSet);
+ if (accountId != null) {
+ sbWhere.append(" INNER JOIN (SELECT "
+ + RawContacts.CONTACT_ID
+ + " AS raw_contact_contact_id FROM "
+ + Tables.RAW_CONTACTS + " WHERE "
+ + RawContactsColumns.ACCOUNT_ID + " = "
+ + accountId
+ + ") ON raw_contact_contact_id = " + Contacts._ID);
+ }
+ }
+ }
+
+ if (!TextUtils.isEmpty(sbWhere.toString())) {
+ if ("true".equals(withoutSim)) {
+ qb.appendWhere(sbWhere.toString());
+ } else {
+ sb.append(sbWhere.toString());
+ }
+ }
+
if (filter != null) {
filter = filter.trim();
}
@@ -7580,22 +7636,50 @@
sb.append("(1)");
}
- final AccountWithDataSet accountWithDataSet = getAccountWithDataSetFromUri(uri);
- // Accounts are valid by only checking one parameter, since we've
- // already ruled out partial accounts.
- final boolean validAccount = !TextUtils.isEmpty(accountWithDataSet.getAccountName());
- if (validAccount) {
- final Long accountId = mDbHelper.get().getAccountIdOrNull(accountWithDataSet);
+ String withoutSim = getQueryParameter(uri, WITHOUT_SIM_FLAG);
+ if ("true".equals(withoutSim)) {
+ final long[] accountId = getAccountIdWithoutSim(uri);
+
if (accountId == null) {
// No such account.
sb.setLength(0);
sb.append("(1=2)");
} else {
- sb.append(
- " AND (" + Contacts._ID + " IN (" +
- "SELECT " + RawContacts.CONTACT_ID + " FROM " + Tables.RAW_CONTACTS +
- " WHERE " + RawContactsColumns.ACCOUNT_ID + "=" + accountId.toString() +
- "))");
+ if (accountId.length > 0) {
+ sb.append(
+ " AND (" + Contacts._ID + " not IN (" +
+ "SELECT " + RawContacts.CONTACT_ID + " FROM "
+ + Tables.RAW_CONTACTS +
+ " WHERE " + RawContacts.CONTACT_ID + " not NULL AND ( ");
+ for (int i = 0; i < accountId.length; i++) {
+ sb.append(RawContactsColumns.ACCOUNT_ID + "="
+ + accountId[i]);
+ if (i != accountId.length - 1) {
+ sb.append(" or ");
+ }
+ }
+ sb.append(")))");
+ }
+ }
+ }
+ else {
+ final AccountWithDataSet accountWithDataSet = getAccountWithDataSetFromUri(uri);
+ // Accounts are valid by only checking one parameter, since we've
+ // already ruled out partial accounts.
+ final boolean validAccount = !TextUtils.isEmpty(accountWithDataSet.getAccountName());
+ if (validAccount) {
+ final Long accountId = mDbHelper.get().getAccountIdOrNull(accountWithDataSet);
+ if (accountId == null) {
+ // No such account.
+ sb.setLength(0);
+ sb.append("(1=2)");
+ } else {
+ sb.append(
+ " AND (" + Contacts._ID + " IN (" +
+ "SELECT " + RawContacts.CONTACT_ID + " FROM " + Tables.RAW_CONTACTS +
+ " WHERE " + RawContactsColumns.ACCOUNT_ID + "=" + accountId.toString() +
+ "))");
+ }
}
}
qb.appendWhere(sb.toString());
@@ -7645,6 +7729,56 @@
}
}
+ private long[] getAccountIdWithoutSim(Uri uri) {
+ final String accountType = getQueryParameter(uri, RawContacts.ACCOUNT_TYPE);
+ final String accountName = getQueryParameter(uri, RawContacts.ACCOUNT_NAME);
+ Cursor c = null;
+ SQLiteDatabase db = mContactsHelper.getWritableDatabase();
+ long[] accountId = null;
+ try {
+ if (null != accountType) {
+ c = db.query(Tables.ACCOUNTS,
+ new String[] { AccountsColumns._ID },
+ AccountsColumns.ACCOUNT_TYPE + "=?",
+ new String[] { String.valueOf(accountType) }, null,
+ null, null);
+ } else if (!TextUtils.isEmpty(accountName)) {
+ String[] names = accountName.split(",");
+ int nameCount = names.length;
+ String where = AccountsColumns.ACCOUNT_NAME + "=?";
+ StringBuilder selection = new StringBuilder();
+ String[] selectionArgs = new String[nameCount];
+ for (int i = 0; i < nameCount; i++) {
+ selection.append(where);
+ if (i != nameCount - 1) {
+ selection.append(" OR ");
+ }
+ selectionArgs[i] = names[i];
+ }
+ c = db.query(Tables.ACCOUNTS,
+ new String[] { AccountsColumns._ID },
+ selection.toString(),
+ selectionArgs, null,
+ null, null);
+ }
+
+ if (c != null) {
+ accountId = new long[c.getCount()];
+
+ for (int i = 0; i < c.getCount(); i++) {
+ if (c.moveToNext()) {
+ accountId[c.getPosition()] = c.getInt(0);
+ }
+ }
+ }
+ } finally {
+ if (c != null) {
+ c.close();
+ }
+ }
+ return accountId;
+ }
+
private AccountWithDataSet getAccountWithDataSetFromUri(Uri uri) {
final String accountName = getQueryParameter(uri, RawContacts.ACCOUNT_NAME);
final String accountType = getQueryParameter(uri, RawContacts.ACCOUNT_TYPE);
diff --git a/src/com/android/providers/contacts/LegacyApiSupport.java b/src/com/android/providers/contacts/LegacyApiSupport.java
old mode 100644
new mode 100755
index 598a4a0..060f87e
--- a/src/com/android/providers/contacts/LegacyApiSupport.java
+++ b/src/com/android/providers/contacts/LegacyApiSupport.java
@@ -1937,8 +1937,7 @@
sb.append(" AND " + RawContacts.ACCOUNT_TYPE + "=");
DatabaseUtils.appendEscapedSQLString(sb, mAccount.type);
} else {
- sb.append(RawContacts.ACCOUNT_NAME + " IS NULL" +
- " AND " + RawContacts.ACCOUNT_TYPE + " IS NULL");
+ sb.append("1=1");
}
}
@@ -1955,8 +1954,10 @@
sb.append(" AND " + Groups.ACCOUNT_TYPE + "=");
DatabaseUtils.appendEscapedSQLString(sb, mAccount.type);
} else {
- sb.append(Groups.ACCOUNT_NAME + " IS NULL" +
- " AND " + Groups.ACCOUNT_TYPE + " IS NULL");
+ sb.append(Groups.ACCOUNT_NAME + " = '"
+ + AccountWithDataSet.LOCAL.getAccountName() + "' AND "
+ + Groups.ACCOUNT_TYPE + " = '"
+ + AccountWithDataSet.LOCAL.getAccountType() + "'");
}
}