Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0bb9d832: am f7c4509f: Merge "NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI" into lmp-dev

Browse Source 
* commit '0bb9d8327500c265c2efd82449db23421cd70d83':
  NoMan: Evaluate all contacts matching EXTRA_PEOPLE URI
This commit is contained in:
Christoph Studer
2014-09-29 21:01:43 +00:00
committed by Android Git Automerger
parent 04cea9f8e0 0bb9d83275
commit 35c7eedc9a
1 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
services/core/java/com/android/server/notification/ValidateNotificationPeople.java
View File

@@ -231,7 +231,7 @@ public class ValidateNotificationPeople implements NotificationSignalExtractor {
if (lookupResult == null || lookupResult.isExpired()) { if (lookupResult == null || lookupResult.isExpired()) {
pendingLookups.add(handle); pendingLookups.add(handle);
} else { } else {
if (DEBUG) Slog.d(TAG, "using cached lookupResult: " + lookupResult.mId); if (DEBUG) Slog.d(TAG, "using cached lookupResult");
} }
if (lookupResult != null) { if (lookupResult != null) {
affinity = Math.max(affinity, lookupResult.getAffinity()); affinity = Math.max(affinity, lookupResult.getAffinity());
@@ -336,11 +336,14 @@ public class ValidateNotificationPeople implements NotificationSignalExtractor {
Cursor c = null; Cursor c = null;
try { try {
c = context.getContentResolver().query(lookupUri, LOOKUP_PROJECTION, null, null, null); c = context.getContentResolver().query(lookupUri, LOOKUP_PROJECTION, null, null, null);
if (c != null && c.getCount() > 0) { if (c == null) {
c.moveToFirst(); Slog.w(TAG, "Null cursor from contacts query.");
lookupResult.readContact(c); return lookupResult;
} }
} catch(Throwable t) { while (c.moveToNext()) {
lookupResult.mergeContact(c);
}
} catch (Throwable t) {
Slog.w(TAG, "Problem getting content resolver or performing contacts query.", t); Slog.w(TAG, "Problem getting content resolver or performing contacts query.", t);
} finally { } finally {
if (c != null) { if (c != null) {
@@ -352,61 +355,54 @@ public class ValidateNotificationPeople implements NotificationSignalExtractor {
private static class LookupResult { private static class LookupResult {
private static final long CONTACT_REFRESH_MILLIS = 60 * 60 * 1000; // 1hr private static final long CONTACT_REFRESH_MILLIS = 60 * 60 * 1000; // 1hr
public static final int INVALID_ID = -1;
private final long mExpireMillis; private final long mExpireMillis;
private int mId; private float mAffinity = NONE;
private boolean mStarred;
public LookupResult() { public LookupResult() {
mId = INVALID_ID;
mStarred = false;
mExpireMillis = System.currentTimeMillis() + CONTACT_REFRESH_MILLIS; mExpireMillis = System.currentTimeMillis() + CONTACT_REFRESH_MILLIS;
} }
public void readContact(Cursor cursor) { public void mergeContact(Cursor cursor) {
mAffinity = Math.max(mAffinity, VALID_CONTACT);
// Contact ID
int id;
final int idIdx = cursor.getColumnIndex(Contacts._ID); final int idIdx = cursor.getColumnIndex(Contacts._ID);
if (idIdx >= 0) { if (idIdx >= 0) {
mId = cursor.getInt(idIdx); id = cursor.getInt(idIdx);
if (DEBUG) Slog.d(TAG, "contact _ID is: " + mId); if (DEBUG) Slog.d(TAG, "contact _ID is: " + id);
} else { } else {
if (DEBUG) Slog.d(TAG, "invalid cursor: no _ID"); id = -1;
Slog.i(TAG, "invalid cursor: no _ID");
} }
// Starred
final int starIdx = cursor.getColumnIndex(Contacts.STARRED); final int starIdx = cursor.getColumnIndex(Contacts.STARRED);
if (starIdx >= 0) { if (starIdx >= 0) {
mStarred = cursor.getInt(starIdx) != 0; boolean isStarred = cursor.getInt(starIdx) != 0;
if (DEBUG) Slog.d(TAG, "contact STARRED is: " + mStarred); if (isStarred) {
mAffinity = Math.max(mAffinity, STARRED_CONTACT);
}
if (DEBUG) Slog.d(TAG, "contact STARRED is: " + isStarred);
} else { } else {
if (DEBUG) Slog.d(TAG, "invalid cursor: no STARRED"); if (DEBUG) Slog.d(TAG, "invalid cursor: no STARRED");
} }
} }
public boolean isExpired() { private boolean isExpired() {
return mExpireMillis < System.currentTimeMillis(); return mExpireMillis < System.currentTimeMillis();
} }
public boolean isInvalid() { private boolean isInvalid() {
return mId == INVALID_ID || isExpired(); return mAffinity == NONE || isExpired();
} }
public float getAffinity() { public float getAffinity() {
if (isInvalid()) { if (isInvalid()) {
return NONE; return NONE;
} else if (mStarred) {
return STARRED_CONTACT;
} else {
return VALID_CONTACT;
} }
} return mAffinity;
public LookupResult setStarred(boolean starred) {
mStarred = starred;
return this;
}
public LookupResult setId(int id) {
mId = id;
return this;
} }
} }