donut snapshot (ac1e59d8) · Commits · e / os / android_frameworks_base

Android.mk

+20 −9

Original line number	Diff line number	Diff line
		@@ -326,7 +326,13 @@ framework_docs_LOCAL_JAVA_LIBRARIES := \

		framework_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html
		# The since flag (-since N.xml API_LEVEL) is used to add API Level information
		# to the reference documentation. Must be in order of oldest to newest.
		framework_docs_LOCAL_DROIDDOC_OPTIONS := \
		-since ./frameworks/base/api/1.xml 1 \
		-since ./frameworks/base/api/2.xml 2 \
		-since ./frameworks/base/api/3.xml 3 \
		-since ./frameworks/base/api/current.xml Donut \
		-error 1 -error 2 -warning 3 -error 4 -error 6 -error 8 \
		-overview $(LOCAL_PATH)/core/java/overview.html

		@@ -343,14 +349,15 @@ web_docs_sample_code_flags := \
		-samplecode $(sample_dir)/NotePad \
		guide/samples/NotePad "Note Pad"

		# SDK version identifiers used in the published docs.

		# major[.minor] version for SDK. Typically identical to the
		# most current Android platform version included in the SDK package.
		## SDK version identifiers used in the published docs
		# major[.minor] version for current SDK. (full releases only)
		framework_docs_SDK_VERSION:=1.5
		# release version for SDK (ie "Release x")
		# release version (ie "Release x") (full releases only)
		framework_docs_SDK_REL_ID:=3
		# name of current SDK directory (full releases only)
		framework_docs_SDK_CURRENT_DIR:=$(framework_docs_SDK_VERSION)_r$(framework_docs_SDK_REL_ID)
		# flag to build offline docs for a preview release
		framework_docs_SDK_PREVIEW:=true

		framework_docs_LOCAL_DROIDDOC_OPTIONS += \
		-hdf sdk.version $(framework_docs_SDK_VERSION) \
		@@ -381,6 +388,10 @@ LOCAL_DROIDDOC_OPTIONS:=\
		-warning 3 \
		-hdf android.whichdoc offline

		ifeq ($(framework_docs_SDK_PREVIEW),true)
		LOCAL_DROIDDOC_OPTIONS += -hdf sdk.current preview
		endif

		LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
		LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk

cmds/keystore/netkeystore.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@
		#include "netkeystore.h"
		#include "keymgmt.h"

		#define DBG 1
		#define CMD_PUT_WITH_FILE "putfile"

		typedef void CMD_FUNC(LPC_MARSHAL cmd, LPC_MARSHAL reply);
		@@ -397,12 +398,12 @@ int main(const int argc, const char *argv[])

		// read the command, execute and send the result back.
		if(read_marshal(s, &cmd)) goto err;
		LOGI("new connection\n");
		if (DBG) LOGD("new connection\n");
		execute(&cmd, &reply);
		write_marshal(s, &reply);
		err:
		memset(&reply, 0, sizeof(LPC_MARSHAL));
		LOGI("closing connection\n");
		if (DBG) LOGD("closing connection\n");
		close(s);
		}

core/java/android/app/SearchDialog.java

+6 −40

Original line number	Diff line number	Diff line
		@@ -693,39 +693,6 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
		return mLaunchComponent.flattenToShortString().startsWith("com.android.browser/");
		}

		/*
		* Menu.
		*/

		@Override
		public boolean onCreateOptionsMenu(Menu menu) {
		// Show search settings menu item if anyone handles the intent for it
		Intent settingsIntent = new Intent(SearchManager.INTENT_ACTION_SEARCH_SETTINGS);
		settingsIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		PackageManager pm = getContext().getPackageManager();
		ActivityInfo activityInfo = settingsIntent.resolveActivityInfo(pm, 0);
		if (activityInfo != null) {
		settingsIntent.setClassName(activityInfo.applicationInfo.packageName,
		activityInfo.name);
		CharSequence label = activityInfo.loadLabel(getContext().getPackageManager());
		menu.add(Menu.NONE, Menu.NONE, Menu.NONE, label)
		.setIcon(android.R.drawable.ic_menu_preferences)
		.setAlphabeticShortcut('P')
		.setIntent(settingsIntent);
		return true;
		}
		return super.onCreateOptionsMenu(menu);
		}

		@Override
		public boolean onMenuOpened(int featureId, Menu menu) {
		// The menu shows up above the IME, regardless of whether it is in front
		// of the drop-down or not. This looks weird when there is no IME, so
		// we make sure it is visible.
		mSearchAutoComplete.ensureImeVisible();
		return super.onMenuOpened(featureId, menu);
		}

		/**
		* Listeners of various types
		*/
		@@ -899,16 +866,15 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
		return;
		}
		try {
		if (mSearchable.getVoiceSearchLaunchWebSearch()) {
		getContext().startActivity(mVoiceWebSearchIntent);
		} else if (mSearchable.getVoiceSearchLaunchRecognizer()) {
		Intent appSearchIntent = createVoiceAppSearchIntent(mVoiceAppSearchIntent);

		// Stop the existing search before starting voice search, or else we'll end
		// First stop the existing search before starting voice search, or else we'll end
		// up showing the search dialog again once we return to the app.
		((SearchManager) getContext().getSystemService(Context.SEARCH_SERVICE)).
		stopSearch();

		if (mSearchable.getVoiceSearchLaunchWebSearch()) {
		getContext().startActivity(mVoiceWebSearchIntent);
		} else if (mSearchable.getVoiceSearchLaunchRecognizer()) {
		Intent appSearchIntent = createVoiceAppSearchIntent(mVoiceAppSearchIntent);
		getContext().startActivity(appSearchIntent);
		}
		} catch (ActivityNotFoundException e) {

core/java/android/app/SuggestionsAdapter.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -658,7 +658,14 @@ class SuggestionsAdapter extends ResourceCursorAdapter {
		if (col == NONE) {
		return null;
		}
		try {
		return cursor.getString(col);
		} catch (Exception e) {
		Log.e(LOG_TAG,
		"unexpected error retrieving valid column from cursor, "
		+ "did the remote process die?", e);
		return null;
		}
		}

		}

core/java/android/net/http/EventHandler.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,10 @@ public interface EventHandler {
		* SSL certificate error callback. Handles SSL error(s) on the way
		* up to the user. The callback has to make sure that restartConnection() is called,
		* otherwise the connection will be suspended indefinitely.
		* @return True if the callback can handle the error, which means it will
		* call restartConnection() to unblock the thread later,
		* otherwise return false.
		*/
		public void handleSslErrorRequest(SslError error);
		public boolean handleSslErrorRequest(SslError error);

		}