Merge donut into master (74008f60) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -114,6 +114,7 @@ LOCAL_SRC_FILES += \
	core/java/com/android/internal/view/IInputMethodManager.aidl \		core/java/com/android/internal/view/IInputMethodManager.aidl \
	core/java/com/android/internal/view/IInputMethodSession.aidl \		core/java/com/android/internal/view/IInputMethodSession.aidl \
	im/java/android/im/IImPlugin.aidl \		im/java/android/im/IImPlugin.aidl \
			location/java/android/location/IGeocodeProvider.aidl \
	location/java/android/location/IGpsStatusListener.aidl \		location/java/android/location/IGpsStatusListener.aidl \
	location/java/android/location/ILocationCollector.aidl \		location/java/android/location/ILocationCollector.aidl \
	location/java/android/location/ILocationListener.aidl \		location/java/android/location/ILocationListener.aidl \

api/current.xml

+28744 −42227

File changed.

Preview size limit exceeded, changes collapsed.

camera/libcameraservice/CameraService.cpp

+10 −4

Original line number	Original line	Diff line number	Diff line
	@@ -217,7 +217,13 @@ status_t CameraService::Client::unlock()
	// allow anyone to use camera		// allow anyone to use camera
	LOGV("unlock (%p)", getCameraClient()->asBinder().get());		LOGV("unlock (%p)", getCameraClient()->asBinder().get());
	status_t result = checkPid();		status_t result = checkPid();
	if (result == NO_ERROR) mClientPid = 0;		if (result == NO_ERROR) {
			mClientPid = 0;

			// we need to remove the reference so that when app goes
			// away, the reference count goes to 0.
			mCameraClient.clear();
			}
	return result;		return result;
	}		}

	@@ -894,8 +900,6 @@ status_t CameraService::Client::setParameters(const String8& params)
	// get preview/capture parameters - key/value pairs		// get preview/capture parameters - key/value pairs
	String8 CameraService::Client::getParameters() const		String8 CameraService::Client::getParameters() const
	{		{
	LOGD("getParameters");

	Mutex::Autolock lock(mLock);		Mutex::Autolock lock(mLock);

	if (mHardware == 0) {		if (mHardware == 0) {
	@@ -903,7 +907,9 @@ String8 CameraService::Client::getParameters() const
	return String8();		return String8();
	}		}

	return mHardware->getParameters().flatten();		String8 params(mHardware->getParameters().flatten());
			LOGD("getParameters(%s)", params.string());
			return params;
	}		}

	void CameraService::Client::postAutoFocus(bool focused)		void CameraService::Client::postAutoFocus(bool focused)

core/java/android/app/Activity.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -611,7 +611,7 @@ public class Activity extends ContextThemeWrapper
	private IBinder mToken;		private IBinder mToken;
	/package/ String mEmbeddedID;		/package/ String mEmbeddedID;
	private Application mApplication;		private Application mApplication;
	private Intent mIntent;		/package/ Intent mIntent;
	private ComponentName mComponent;		private ComponentName mComponent;
	/package/ ActivityInfo mActivityInfo;		/package/ ActivityInfo mActivityInfo;
	/package/ ActivityThread mMainThread;		/package/ ActivityThread mMainThread;

core/java/android/app/ActivityThread.java

+10 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1689,7 +1689,7 @@ public final class ActivityThread {

	r.packageInfo = getPackageInfoNoCheck(		r.packageInfo = getPackageInfoNoCheck(
	r.activityInfo.applicationInfo);		r.activityInfo.applicationInfo);
	handleLaunchActivity(r);		handleLaunchActivity(r, null);
	} break;		} break;
	case RELAUNCH_ACTIVITY: {		case RELAUNCH_ACTIVITY: {
	ActivityRecord r = (ActivityRecord)msg.obj;		ActivityRecord r = (ActivityRecord)msg.obj;
	@@ -2109,7 +2109,7 @@ public final class ActivityThread {
	+ ", comp=" + name		+ ", comp=" + name
	+ ", token=" + token);		+ ", token=" + token);
	}		}
	return performLaunchActivity(r);		return performLaunchActivity(r, null);
	}		}

	public final Activity getActivity(IBinder token) {		public final Activity getActivity(IBinder token) {
	@@ -2159,7 +2159,7 @@ public final class ActivityThread {
	queueOrSendMessage(H.CLEAN_UP_CONTEXT, cci);		queueOrSendMessage(H.CLEAN_UP_CONTEXT, cci);
	}		}

	private final Activity performLaunchActivity(ActivityRecord r) {		private final Activity performLaunchActivity(ActivityRecord r, Intent customIntent) {
	// System.out.println("##### [" + System.currentTimeMillis() + "] ActivityThread.performLaunchActivity(" + r + ")");		// System.out.println("##### [" + System.currentTimeMillis() + "] ActivityThread.performLaunchActivity(" + r + ")");

	ActivityInfo aInfo = r.activityInfo;		ActivityInfo aInfo = r.activityInfo;
	@@ -2219,6 +2219,9 @@ public final class ActivityThread {
	r.lastNonConfigurationInstance, r.lastNonConfigurationChildInstances,		r.lastNonConfigurationInstance, r.lastNonConfigurationChildInstances,
	config);		config);

			if (customIntent != null) {
			activity.mIntent = customIntent;
			}
	r.lastNonConfigurationInstance = null;		r.lastNonConfigurationInstance = null;
	r.lastNonConfigurationChildInstances = null;		r.lastNonConfigurationChildInstances = null;
	activity.mStartedActivity = false;		activity.mStartedActivity = false;
	@@ -2274,14 +2277,14 @@ public final class ActivityThread {
	return activity;		return activity;
	}		}

	private final void handleLaunchActivity(ActivityRecord r) {		private final void handleLaunchActivity(ActivityRecord r, Intent customIntent) {
	// If we are getting ready to gc after going to the background, well		// If we are getting ready to gc after going to the background, well
	// we are back active so skip it.		// we are back active so skip it.
	unscheduleGcIdler();		unscheduleGcIdler();

	if (localLOGV) Log.v(		if (localLOGV) Log.v(
	TAG, "Handling launch of " + r);		TAG, "Handling launch of " + r);
	Activity a = performLaunchActivity(r);		Activity a = performLaunchActivity(r, customIntent);

	if (a != null) {		if (a != null) {
	handleResumeActivity(r.token, false, r.isForward);		handleResumeActivity(r.token, false, r.isForward);
	@@ -3243,6 +3246,7 @@ public final class ActivityThread {
	}		}

	r.activity.mConfigChangeFlags \|= configChanges;		r.activity.mConfigChangeFlags \|= configChanges;
			Intent currentIntent = r.activity.mIntent;

	Bundle savedState = null;		Bundle savedState = null;
	if (!r.paused) {		if (!r.paused) {
	@@ -3275,7 +3279,7 @@ public final class ActivityThread {
	r.state = savedState;		r.state = savedState;
	}		}

	handleLaunchActivity(r);		handleLaunchActivity(r, currentIntent);
	}		}

	private final void handleRequestThumbnail(IBinder token) {		private final void handleRequestThumbnail(IBinder token) {