Merge change 7140 into donut (4caac2bb) · Commits · e / os / android_frameworks_base

core/java/android/provider/Telephony.java

+10 −4

Original line number	Original line	Diff line number	Diff line
	@@ -44,7 +44,7 @@ import java.util.regex.Pattern;
	*/		*/
	public final class Telephony {		public final class Telephony {
	private static final String TAG = "Telephony";		private static final String TAG = "Telephony";
	private static final boolean DEBUG = false;		private static final boolean DEBUG = true;
	private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV;		private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV;

	// Constructor		// Constructor
	@@ -1136,8 +1136,14 @@ public final class Telephony {
	}		}

	Uri uri = uriBuilder.build();		Uri uri = uriBuilder.build();
			if (DEBUG) {
			Log.v(TAG, "getOrCreateThreadId uri: " + uri);
			}
	Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),		Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
	uri, ID_PROJECTION, null, null, null);		uri, ID_PROJECTION, null, null, null);
			if (DEBUG) {
			Log.v(TAG, "getOrCreateThreadId cursor cnt: " + cursor.getCount());
			}
	if (cursor != null) {		if (cursor != null) {
	try {		try {
	if (cursor.moveToFirst()) {		if (cursor.moveToFirst()) {