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

am 358e6e3c: Merge change 22292 into eclair

Browse Source 
Merge commit '358e6e3c121f8ac5ac4a2c99b9d2211dfb2d3083' into eclair-plus-aosp

* commit '358e6e3c121f8ac5ac4a2c99b9d2211dfb2d3083':
  Adding a "Photo" directory under Contacts.
This commit is contained in:
Dmitri Plotnikov
2009-08-21 13:42:54 -07:00
committed by Android Git Automerger
parent b5a79aa3e5 358e6e3c12
commit b0ef6ca47d
1 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/java/android/provider/ContactsContract.java
View File

@@ -29,6 +29,7 @@ import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.RemoteException;
import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
import android.provider.ContactsContract.Contacts.Photo;
import android.text.TextUtils;
import java.io.ByteArrayInputStream;
@@ -307,35 +308,18 @@ public final class ContactsContract {
}
/**
* Returns a URI that can be used to retrieve the contact's default photo.
*
* @param contactUri the contact whose photo should be used
* A sub-directory of a single contact that contains the contact's primary photo.
*/
public static Uri getPhotoUri(ContentResolver cr, Uri contactUri) {
public static final class Photo implements BaseColumns, DataColumns {
/**
* no public constructor since this is a utility class
*/
private Photo() {}
// TODO remove try/catch block as soon as eclair-dev is merged in eclair
try {
long photoId = -1;
Cursor cursor = cr.query(contactUri, new String[] {Contacts.PHOTO_ID},
null, null, null);
try {
if (!cursor.moveToNext()) {
return null;
}
if (cursor.isNull(0)) {
return null;
}
photoId = cursor.getLong(0);
} finally {
cursor.close();
}
return ContentUris.withAppendedId(ContactsContract.Data.CONTENT_URI, photoId);
} catch (Exception e) {
return null;
}
/**
* The directory twig for this sub-table
*/
public static final String CONTENT_DIRECTORY = "photo";
}
/**
@@ -345,7 +329,7 @@ public final class ContactsContract {
* @param contactUri the contact whose photo should be used
*/
public static InputStream openContactPhotoInputStream(ContentResolver cr, Uri contactUri) {
Uri photoUri = getPhotoUri(cr, contactUri);
Uri photoUri = Uri.withAppendedPath(contactUri, Photo.CONTENT_DIRECTORY);
if (photoUri == null) {
return null;
}