Merge branch 'eclair' into eclair-release (a79d6f42) · Commits · e / os / android_frameworks_base

camera/libcameraservice/CameraService.cpp

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -563,7 +563,19 @@ status_t CameraService::Client::setOverlay()
	status_t ret = NO_ERROR;		status_t ret = NO_ERROR;
	if (mSurface != 0) {		if (mSurface != 0) {
	if (mOverlayRef.get() == NULL) {		if (mOverlayRef.get() == NULL) {

			// FIXME:
			// Surfaceflinger may hold onto the previous overlay reference for some
			// time after we try to destroy it. retry a few times. In the future, we
			// should make the destroy call block, or possibly specify that we can
			// wait in the createOverlay call if the previous overlay is in the
			// process of being destroyed.
			for (int retry = 0; retry < 50; ++retry) {
	mOverlayRef = mSurface->createOverlay(w, h, OVERLAY_FORMAT_DEFAULT);		mOverlayRef = mSurface->createOverlay(w, h, OVERLAY_FORMAT_DEFAULT);
			if (mOverlayRef != NULL) break;
			LOGD("Overlay create failed - retrying");
			usleep(20000);
			}
	if ( mOverlayRef.get() == NULL )		if ( mOverlayRef.get() == NULL )
	{		{
	LOGE("Overlay Creation Failed!");		LOGE("Overlay Creation Failed!");

cmds/dumpstate/dumpstate.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -110,7 +110,7 @@ static void dumpstate(int full) {
	PRINT("------ PACKAGE UID ERRORS ------");		PRINT("------ PACKAGE UID ERRORS ------");
	DUMP("/data/system/uiderrors.txt");		DUMP("/data/system/uiderrors.txt");

	dump_kernel_log("/data/dontpanic/last_kmsg", "RAMCONSOLE");		dump_kernel_log("/data/dontpanic/last_kmsg", "LAST KMSG");
	dump_kernel_log("/data/dontpanic/apanic_console",		dump_kernel_log("/data/dontpanic/apanic_console",
	"PANIC CONSOLE");		"PANIC CONSOLE");
	dump_kernel_log("/data/dontpanic/apanic_threads",		dump_kernel_log("/data/dontpanic/apanic_threads",

core/java/android/accounts/AuthenticatorBindHelper.java

+15 −9

Original line number	Original line	Diff line number	Diff line
	@@ -146,7 +146,7 @@ public class AuthenticatorBindHelper {
	Log.v(TAG, "there are no more callbacks for service "		Log.v(TAG, "there are no more callbacks for service "
	+ authenticatorType + ", unbinding service");		+ authenticatorType + ", unbinding service");
	}		}
	unbindFromService(authenticatorType);		unbindFromServiceLocked(authenticatorType);
	} else {		} else {
	if (Log.isLoggable(TAG, Log.VERBOSE)) {		if (Log.isLoggable(TAG, Log.VERBOSE)) {
	Log.v(TAG, "leaving service " + authenticatorType		Log.v(TAG, "leaving service " + authenticatorType
	@@ -161,7 +161,10 @@ public class AuthenticatorBindHelper {
	}		}
	}		}

	private void unbindFromService(String authenticatorType) {		/**
			* You must synchronized on mServiceConnections before calling this
			*/
			private void unbindFromServiceLocked(String authenticatorType) {
	if (Log.isLoggable(TAG, Log.VERBOSE)) {		if (Log.isLoggable(TAG, Log.VERBOSE)) {
	Log.v(TAG, "unbindService from " + authenticatorType);		Log.v(TAG, "unbindService from " + authenticatorType);
	}		}
	@@ -217,7 +220,9 @@ public class AuthenticatorBindHelper {
	// post a message for each service user to tell them that the service is disconnected,		// post a message for each service user to tell them that the service is disconnected,
	// and unbind from the service.		// and unbind from the service.
	synchronized (mServiceConnections) {		synchronized (mServiceConnections) {
	for (Callback callback : mServiceUsers.get(mAuthenticatorType)) {		final ArrayList<Callback> callbackList = mServiceUsers.get(mAuthenticatorType);
			if (callbackList != null) {
			for (Callback callback : callbackList) {
	if (Log.isLoggable(TAG, Log.VERBOSE)) {		if (Log.isLoggable(TAG, Log.VERBOSE)) {
	Log.v(TAG, "the service became disconnected, scheduling a "		Log.v(TAG, "the service became disconnected, scheduling a "
	+ "disconnected message for "		+ "disconnected message for "
	@@ -225,7 +230,8 @@ public class AuthenticatorBindHelper {
	}		}
	mHandler.obtainMessage(mMessageWhatDisconnected, callback).sendToTarget();		mHandler.obtainMessage(mMessageWhatDisconnected, callback).sendToTarget();
	}		}
	unbindFromService(mAuthenticatorType);		unbindFromServiceLocked(mAuthenticatorType);
			}
	}		}
	}		}
	}		}

core/java/android/app/SearchDialog.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1314,13 +1314,13 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
	// source. this is because GlobalSearch may not have permission to launch the		// source. this is because GlobalSearch may not have permission to launch the
	// intent, and to avoid the extra step of going through GlobalSearch.		// intent, and to avoid the extra step of going through GlobalSearch.
	if (mGlobalSearchMode) {		if (mGlobalSearchMode) {
			launchGlobalSearchIntent(intent);
	if (mStoredComponentName != null) {		if (mStoredComponentName != null) {
	// If we're embedded in an application, dismiss the dialog.		// If we're embedded in an application, dismiss the dialog.
	// This ensures that if the intent is handled by the current		// This ensures that if the intent is handled by the current
	// activity, it's not obscured by the dialog.		// activity, it's not obscured by the dialog.
	dismiss();		dismiss();
	}		}
	launchGlobalSearchIntent(intent);
	} else {		} else {
	// If the intent was created from a suggestion, it will always have an explicit		// If the intent was created from a suggestion, it will always have an explicit
	// component here.		// component here.

core/java/android/bluetooth/BluetoothDevice.java

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -287,9 +287,13 @@ public final class BluetoothDevice implements Parcelable {
	/** A bond attempt failed because of repeated attempts		/** A bond attempt failed because of repeated attempts
	* @hide */		* @hide */
	public static final int UNBOND_REASON_REPEATED_ATTEMPTS = 7;		public static final int UNBOND_REASON_REPEATED_ATTEMPTS = 7;
			/** A bond attempt failed because we received an Authentication Cancel
			* by remote end
			* @hide */
			public static final int UNBOND_REASON_REMOTE_AUTH_CANCELED = 8;
	/** An existing bond was explicitly revoked		/** An existing bond was explicitly revoked
	* @hide */		* @hide */
	public static final int UNBOND_REASON_REMOVED = 8;		public static final int UNBOND_REASON_REMOVED = 9;

	/** The user will be prompted to enter a pin		/** The user will be prompted to enter a pin
	* @hide */		* @hide */