Merge branch 'froyo' into froyo-release (e407ecc3) · Commits · e / os / android_frameworks_base

core/java/android/content/ContentResolver.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -247,6 +247,8 @@ public abstract class ContentResolver {
	releaseProvider(provider);		releaseProvider(provider);
	return null;		return null;
	}		}
			// force query execution
			qCursor.getCount();
	long durationMillis = SystemClock.uptimeMillis() - startTime;		long durationMillis = SystemClock.uptimeMillis() - startTime;
	maybeLogQueryToEventLog(durationMillis, uri, projection, selection, sortOrder);		maybeLogQueryToEventLog(durationMillis, uri, projection, selection, sortOrder);
	// Wrap the cursor object into CursorWrapperInner object		// Wrap the cursor object into CursorWrapperInner object

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1561,11 +1561,7 @@ public class SyncManager implements OnAccountsUpdateListener {
	synchronized (mSyncQueue) {		synchronized (mSyncQueue) {
	nextOpAndRunTime = mSyncQueue.nextOperation();		nextOpAndRunTime = mSyncQueue.nextOperation();
	}		}
	SyncOperation curOp = activeSyncContext.mSyncOperation;		if (nextOpAndRunTime != null && nextOpAndRunTime.second <= now) {
	if (nextOpAndRunTime != null
	&& nextOpAndRunTime.second <= now
	&& !nextOpAndRunTime.first.account.equals(curOp.account)
	&& !nextOpAndRunTime.first.authority.equals(curOp.authority)) {
	Log.d(TAG, "canceling and rescheduling sync because it ran too long: "		Log.d(TAG, "canceling and rescheduling sync because it ran too long: "
	+ activeSyncContext.mSyncOperation);		+ activeSyncContext.mSyncOperation);
	scheduleSyncOperation(new SyncOperation(activeSyncContext.mSyncOperation));		scheduleSyncOperation(new SyncOperation(activeSyncContext.mSyncOperation));

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1341,18 +1341,18 @@ public class SQLiteDatabase extends SQLiteClosable {
	SQLiteCursorDriver driver = new SQLiteDirectCursorDriver(this, sql, editTable);		SQLiteCursorDriver driver = new SQLiteDirectCursorDriver(this, sql, editTable);

	Cursor cursor = null;		Cursor cursor = null;
	int count = 0;
	try {		try {
	cursor = driver.query(		cursor = driver.query(
	cursorFactory != null ? cursorFactory : mFactory,		cursorFactory != null ? cursorFactory : mFactory,
	selectionArgs);		selectionArgs);
			} finally {
			if (Config.LOGV \|\| mSlowQueryThreshold != -1) {

	// Force query execution		// Force query execution
			int count = -1;
	if (cursor != null) {		if (cursor != null) {
	count = cursor.getCount();		count = cursor.getCount();
	}		}
	} finally {
	if (Config.LOGV \|\| mSlowQueryThreshold != -1) {

	long duration = System.currentTimeMillis() - timeStart;		long duration = System.currentTimeMillis() - timeStart;

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -159,7 +159,7 @@ public abstract class WindowOrientationListener {
	// Additional limits on tilt angle to transition to each new orientation. We ignore all		// Additional limits on tilt angle to transition to each new orientation. We ignore all
	// vectors with tilt beyond MAX_TILT, but we can set stricter limits on transition to a		// vectors with tilt beyond MAX_TILT, but we can set stricter limits on transition to a
	// particular orientation here.		// particular orientation here.
	private final int[] MAX_TRANSITION_TILT = new int[] {MAX_TILT, MAX_TILT, 40, MAX_TILT};		private final int[] MAX_TRANSITION_TILT = new int[] {MAX_TILT, MAX_TILT, MAX_TILT};

	// Between this tilt angle and MAX_TILT, we'll allow orientation changes, but we'll filter		// Between this tilt angle and MAX_TILT, we'll allow orientation changes, but we'll filter
	// with a higher time constant, making us less sensitive to change. This primarily helps		// with a higher time constant, making us less sensitive to change. This primarily helps

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -203,9 +203,6 @@ public class Scroller {

	mCurrX = mStartX + Math.round(x * mDeltaX);		mCurrX = mStartX + Math.round(x * mDeltaX);
	mCurrY = mStartY + Math.round(x * mDeltaY);		mCurrY = mStartY + Math.round(x * mDeltaY);
	if ((mCurrX == mFinalX) && (mCurrY == mFinalY)) {
	mFinished = true;
	}
	break;		break;
	case FLING_MODE:		case FLING_MODE:
	float timePassedSeconds = timePassed / 1000.0f;		float timePassedSeconds = timePassed / 1000.0f;
	@@ -222,10 +219,6 @@ public class Scroller {
	mCurrY = Math.min(mCurrY, mMaxY);		mCurrY = Math.min(mCurrY, mMaxY);
	mCurrY = Math.max(mCurrY, mMinY);		mCurrY = Math.max(mCurrY, mMinY);

	if (mCurrX == mFinalX && mCurrY == mFinalY) {
	mFinished = true;
	}

	break;		break;
	}		}
	}		}