Merge branch 'ics-mr1' of https://android.googlesource.com/platform/frameworks/base into aosp (bec96948) · Commits · e / os / android_frameworks_base

Android.mk

+35 −7

Original line number	Diff line number	Diff line
		@@ -329,20 +329,36 @@ non_base_dirs := \
		../../external/apache-http/src/org/apache/http

		# These are relative to frameworks/base
		dirs_to_document := \
		dirs_to_check_apis := \
		$(fwbase_dirs_to_document) \
		$(non_base_dirs)

		# These are relative to frameworks/base
		# FRAMEWORKS_BASE_SUBDIRS comes from build/core/pathmap.mk
		dirs_to_document := \
		$(dirs_to_check_apis) \
		$(addprefix ../../, $(FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS))

		# These are relative to frameworks/base
		html_dirs := \
		$(FRAMEWORKS_BASE_SUBDIRS) \
		$(non_base_dirs)

		# Common sources for doc check and api check
		common_src_files := \
		$(call find-other-html-files, $(html_dirs)) \
		$(addprefix ../../libcore/, $(call libcore_to_document, $(LOCAL_PATH)/../../libcore)) \
		$(addprefix ../../system/media/mca/, $(call libfilterfw_to_document, $(LOCAL_PATH)/../../system/media/mca)) \

		# These are relative to frameworks/base
		framework_docs_LOCAL_SRC_FILES := \
		$(call find-other-java-files, $(dirs_to_document)) \
		$(call find-other-html-files, $(html_dirs)) \
		$(addprefix ../../libcore/, $(call libcore_to_document, $(LOCAL_PATH)/../../libcore)) \
		$(addprefix ../../system/media/mca/, $(call libfilterfw_to_document, $(LOCAL_PATH)/../../system/media/mca))
		$(common_src_files)

		# These are relative to frameworks/base
		framework_docs_LOCAL_API_CHECK_SRC_FILES := \
		$(call find-other-java-files, $(dirs_to_check_apis)) \
		$(common_src_files)

		# This is used by ide.mk as the list of source files that are
		# always included.
		@@ -382,6 +398,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
		-since ./frameworks/base/api/12.xml 12 \
		-since ./frameworks/base/api/13.xml 13 \
		-since ./frameworks/base/api/14.txt 14 \
		-since ./frameworks/base/api/15.txt 15 \
		-werror -hide 113 \
		-overview $(LOCAL_PATH)/core/java/overview.html

		@@ -412,6 +429,8 @@ web_docs_sample_code_flags := \
		resources/samples/BackupRestore "Backup and Restore" \
		-samplecode $(sample_dir)/BluetoothChat \
		resources/samples/BluetoothChat "Bluetooth Chat" \
		-samplecode $(sample_dir)/BluetoothHDP \
		resources/samples/BluetoothHDP "Bluetooth HDP Demo" \
		-samplecode $(sample_dir)/BusinessCard \
		resources/samples/BusinessCard "Business Card" \
		-samplecode $(sample_dir)/ContactManager \
		@@ -426,10 +445,14 @@ web_docs_sample_code_flags := \
		resources/samples/JetBoy "JetBoy" \
		-samplecode $(sample_dir)/LunarLander \
		resources/samples/LunarLander "Lunar Lander" \
		-samplecode $(sample_dir)/training/ads-and-ux \
		resources/samples/training/ads-and-ux "Mobile Advertisement Integration" \
		-samplecode $(sample_dir)/MultiResolution \
		resources/samples/MultiResolution "Multiple Resolutions" \
		-samplecode $(sample_dir)/NFCDemo \
		resources/samples/NFCDemo "NFC Demo" \
		-samplecode $(sample_dir)/training/multiscreen/newsreader \
		resources/samples/newsreader "News Reader" \
		-samplecode $(sample_dir)/NotePad \
		resources/samples/NotePad "Note Pad" \
		-samplecode $(sample_dir)/SpellChecker/SampleSpellCheckerService \
		@@ -460,6 +483,8 @@ web_docs_sample_code_flags := \
		resources/samples/TicTacToeLib "TicTacToeLib" \
		-samplecode $(sample_dir)/TicTacToeMain \
		resources/samples/TicTacToeMain "TicTacToeMain" \
		-samplecode $(sample_dir)/ToyVpn \
		resources/samples/ToyVpn "Toy VPN Client" \
		-samplecode $(sample_dir)/USB \
		resources/samples/USB "USB" \
		-samplecode $(sample_dir)/WeatherListWidget \
		@@ -477,7 +502,10 @@ web_docs_sample_code_flags := \
		-samplecode $(sample_dir)/XmlAdapters \
		resources/samples/XmlAdapters "XML Adapters" \
		-samplecode $(sample_dir)/TtsEngine \
		resources/samples/TtsEngine "Text To Speech Engine"
		resources/samples/TtsEngine "Text To Speech Engine" \
		-samplecode $(sample_dir)/training/device-management-policy \
		resources/samples/training/device-management-policy "Device Management Policy"


		## SDK version identifiers used in the published docs
		# major[.minor] version for current SDK. (full releases only)
		@@ -493,7 +521,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS += \
		# ==== the api stubs and current.xml ===========================
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES)
		LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES)
		LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)
		LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
		LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)

api/15.txt

0 → 100644

+46744 −0

File added.

Preview size limit exceeded, changes collapsed.

api/current.txt

+161 −8

File changed.

Preview size limit exceeded, changes collapsed.

cmds/am/src/com/android/commands/am/Am.java

+262 −152

Original line number	Diff line number	Diff line
		@@ -60,6 +60,8 @@ public class Am {
		private boolean mWaitOption = false;
		private boolean mStopOption = false;

		private int mRepeat = 0;

		private String mProfileFile;
		private boolean mProfileAutoStop;

		@@ -107,6 +109,10 @@ public class Am {
		runStartService();
		} else if (op.equals("force-stop")) {
		runForceStop();
		} else if (op.equals("kill")) {
		runKill();
		} else if (op.equals("kill-all")) {
		runKillAll();
		} else if (op.equals("instrument")) {
		runInstrument();
		} else if (op.equals("broadcast")) {
		@@ -115,12 +121,20 @@ public class Am {
		runProfile();
		} else if (op.equals("dumpheap")) {
		runDumpHeap();
		} else if (op.equals("set-debug-app")) {
		runSetDebugApp();
		} else if (op.equals("clear-debug-app")) {
		runClearDebugApp();
		} else if (op.equals("monitor")) {
		runMonitor();
		} else if (op.equals("screen-compat")) {
		runScreenCompat();
		} else if (op.equals("display-size")) {
		runDisplaySize();
		} else if (op.equals("to-uri")) {
		runToUri(false);
		} else if (op.equals("to-intent-uri")) {
		runToUri(true);
		} else {
		throw new IllegalArgumentException("Unknown command: " + op);
		}
		@@ -128,11 +142,13 @@ public class Am {

		private Intent makeIntent() throws URISyntaxException {
		Intent intent = new Intent();
		Intent baseIntent = intent;
		boolean hasIntentInfo = false;

		mDebugOption = false;
		mWaitOption = false;
		mStopOption = false;
		mRepeat = 0;
		mProfileFile = null;
		Uri data = null;
		String type = null;
		@@ -141,35 +157,39 @@ public class Am {
		while ((opt=nextOption()) != null) {
		if (opt.equals("-a")) {
		intent.setAction(nextArgRequired());
		if (intent == baseIntent) {
		hasIntentInfo = true;
		}
		} else if (opt.equals("-d")) {
		data = Uri.parse(nextArgRequired());
		if (intent == baseIntent) {
		hasIntentInfo = true;
		}
		} else if (opt.equals("-t")) {
		type = nextArgRequired();
		if (intent == baseIntent) {
		hasIntentInfo = true;
		}
		} else if (opt.equals("-c")) {
		intent.addCategory(nextArgRequired());
		if (intent == baseIntent) {
		hasIntentInfo = true;
		}
		} else if (opt.equals("-e") \|\| opt.equals("--es")) {
		String key = nextArgRequired();
		String value = nextArgRequired();
		intent.putExtra(key, value);
		hasIntentInfo = true;
		} else if (opt.equals("--esn")) {
		String key = nextArgRequired();
		intent.putExtra(key, (String) null);
		hasIntentInfo = true;
		} else if (opt.equals("--ei")) {
		String key = nextArgRequired();
		String value = nextArgRequired();
		intent.putExtra(key, Integer.valueOf(value));
		hasIntentInfo = true;
		} else if (opt.equals("--eu")) {
		String key = nextArgRequired();
		String value = nextArgRequired();
		intent.putExtra(key, Uri.parse(value));
		hasIntentInfo = true;
		} else if (opt.equals("--eia")) {
		String key = nextArgRequired();
		String value = nextArgRequired();
		@@ -179,12 +199,10 @@ public class Am {
		list[i] = Integer.valueOf(strings[i]);
		}
		intent.putExtra(key, list);
		hasIntentInfo = true;
		} else if (opt.equals("--el")) {
		String key = nextArgRequired();
		String value = nextArgRequired();
		intent.putExtra(key, Long.valueOf(value));
		hasIntentInfo = true;
		} else if (opt.equals("--ela")) {
		String key = nextArgRequired();
		String value = nextArgRequired();
		@@ -194,18 +212,18 @@ public class Am {
		list[i] = Long.valueOf(strings[i]);
		}
		intent.putExtra(key, list);
		hasIntentInfo = true;
		} else if (opt.equals("--ez")) {
		String key = nextArgRequired();
		String value = nextArgRequired();
		intent.putExtra(key, Boolean.valueOf(value));
		hasIntentInfo = true;
		} else if (opt.equals("-n")) {
		String str = nextArgRequired();
		ComponentName cn = ComponentName.unflattenFromString(str);
		if (cn == null) throw new IllegalArgumentException("Bad component name: " + str);
		intent.setComponent(cn);
		if (intent == baseIntent) {
		hasIntentInfo = true;
		}
		} else if (opt.equals("-f")) {
		String str = nextArgRequired();
		intent.setFlags(Integer.decode(str).intValue());
		@@ -253,6 +271,9 @@ public class Am {
		intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
		} else if (opt.equals("--receiver-replace-pending")) {
		intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);
		} else if (opt.equals("--selector")) {
		intent.setDataAndType(data, type);
		intent = new Intent();
		} else if (opt.equals("-D")) {
		mDebugOption = true;
		} else if (opt.equals("-W")) {
		@@ -263,6 +284,8 @@ public class Am {
		} else if (opt.equals("--start-profiler")) {
		mProfileFile = nextArgRequired();
		mProfileAutoStop = false;
		} else if (opt.equals("-R")) {
		mRepeat = Integer.parseInt(nextArgRequired());
		} else if (opt.equals("-S")) {
		mStopOption = true;
		} else {
		@@ -273,10 +296,26 @@ public class Am {
		}
		intent.setDataAndType(data, type);

		final boolean hasSelector = intent != baseIntent;
		if (hasSelector) {
		// A selector was specified; fix up.
		baseIntent.setSelector(intent);
		intent = baseIntent;
		}

		String arg = nextArg();
		if (arg != null) {
		Intent baseIntent;
		if (arg.indexOf(':') >= 0) {
		baseIntent = null;
		if (arg == null) {
		if (hasSelector) {
		// If a selector has been specified, and no arguments
		// have been supplied for the main Intent, then we can
		// assume it is ACTION_MAIN CATEGORY_LAUNCHER; we don't
		// need to have a component name specified yet, the
		// selector will take care of that.
		baseIntent = new Intent(Intent.ACTION_MAIN);
		baseIntent.addCategory(Intent.CATEGORY_LAUNCHER);
		}
		} else if (arg.indexOf(':') >= 0) {
		// The argument is a URI. Fully parse it, and use that result
		// to fill in any data not specified so far.
		baseIntent = Intent.parseUri(arg, Intent.URI_INTENT_SCHEME);
		@@ -292,6 +331,7 @@ public class Am {
		baseIntent.addCategory(Intent.CATEGORY_LAUNCHER);
		baseIntent.setPackage(arg);
		}
		if (baseIntent != null) {
		Bundle extras = intent.getExtras();
		intent.replaceExtras((Bundle)null);
		Bundle uriExtras = baseIntent.getExtras();
		@@ -302,7 +342,7 @@ public class Am {
		baseIntent.removeCategory(c);
		}
		}
		intent.fillIn(baseIntent, Intent.FILL_IN_COMPONENT);
		intent.fillIn(baseIntent, Intent.FILL_IN_COMPONENT \| Intent.FILL_IN_SELECTOR);
		if (extras == null) {
		extras = uriExtras;
		} else if (uriExtras != null) {
		@@ -335,6 +375,7 @@ public class Am {
		mimeType = mAm.getProviderMimeType(intent.getData());
		}

		do {
		if (mStopOption) {
		String packageName;
		if (intent.getComponent() != null) {
		@@ -467,12 +508,25 @@ public class Am {
		}
		System.out.println("Complete");
		}
		mRepeat--;
		if (mRepeat > 1) {
		mAm.unhandledBack();
		}
		} while (mRepeat > 1);
		}

		private void runForceStop() throws Exception {
		mAm.forceStopPackage(nextArgRequired());
		}

		private void runKill() throws Exception {
		mAm.killBackgroundProcesses(nextArgRequired());
		}

		private void runKillAll() throws Exception {
		mAm.killAllBackgroundProcesses();
		}

		private void sendBroadcast() throws Exception {
		Intent intent = makeIntent();
		IntentReceiver receiver = new IntentReceiver();
		@@ -643,6 +697,31 @@ public class Am {
		}
		}

		private void runSetDebugApp() throws Exception {
		boolean wait = false;
		boolean persistent = false;

		String opt;
		while ((opt=nextOption()) != null) {
		if (opt.equals("-w")) {
		wait = true;
		} else if (opt.equals("--persistent")) {
		persistent = true;
		} else {
		System.err.println("Error: Unknown option: " + opt);
		showUsage();
		return;
		}
		}

		String pkg = nextArgRequired();
		mAm.setDebugApp(pkg, wait, persistent);
		}

		private void runClearDebugApp() throws Exception {
		mAm.setDebugApp(null, false, true);
		}

		class MyActivityController extends IActivityController.Stub {
		final String mGdbPort;

		@@ -1012,6 +1091,11 @@ public class Am {
		}
		}

		private void runToUri(boolean intentScheme) throws Exception {
		Intent intent = makeIntent();
		System.out.println(intent.toUri(intentScheme ? Intent.URI_INTENT_SCHEME : 0));
		}

		private class IntentReceiver extends IIntentReceiver.Stub {
		private boolean mFinished = false;

		@@ -1164,30 +1248,45 @@ public class Am {
		private static void showUsage() {
		System.err.println(
		"usage: am [subcommand] [options]\n" +
		"usage: am start [-D] [-W] [-P <FILE>] [--start-profiler <FILE>] [-S] <INTENT>\n" +
		"usage: am start [-D] [-W] [-P <FILE>] [--start-profiler <FILE>]\n" +
		" [--R COUNT] [-S] <INTENT>\n" +
		" am startservice <INTENT>\n" +
		" am force-stop <PACKAGE>\n" +
		" am kill <PACKAGE>\n" +
		" am kill-all\n" +
		" am broadcast <INTENT>\n" +
		" am instrument [-r] [-e <NAME> <VALUE>] [-p <FILE>] [-w]\n" +
		" [--no-window-animation] <COMPONENT>\n" +
		" am profile [looper] start <PROCESS> <FILE>\n" +
		" am profile [looper] stop [<PROCESS>]\n" +
		" am dumpheap [flags] <PROCESS> <FILE>\n" +
		" am set-debug-app [-w] [--persistent] <PACKAGE>\n" +
		" am clear-debug-app\n" +
		" am monitor [--gdb <port>]\n" +
		" am screen-compat [on\|off] <PACKAGE>\n" +
		" am display-size [reset\|MxN]\n" +
		" am to-uri [INTENT]\n" +
		" am to-intent-uri [INTENT]\n" +
		"\n" +
		"am start: start an Activity. Options are:\n" +
		" -D: enable debugging\n" +
		" -W: wait for launch to complete\n" +
		" --start-profiler <FILE>: start profiler and send results to <FILE>\n" +
		" -P <FILE>: like above, but profiling stops when app goes idle\n" +
		" -R: repeat the activity launch <COUNT> times. Prior to each repeat,\n" +
		" the top activity will be finished.\n" +
		" -S: force stop the target app before starting the activity\n" +
		"\n" +
		"am startservice: start a Service.\n" +
		"\n" +
		"am force-stop: force stop everything associated with <PACKAGE>.\n" +
		"\n" +
		"am kill: Kill all processes associated with <PACKAGE>. Only kills.\n" +
		" processes that are safe to kill -- that is, will not impact the user\n" +
		" experience.\n" +
		"\n" +
		"am kill-all: Kill all background processes.\n" +
		"\n" +
		"am broadcast: send a broadcast Intent.\n" +
		"\n" +
		"am instrument: start an Instrumentation. Typically this target <COMPONENT>\n" +
		@@ -1206,6 +1305,12 @@ public class Am {
		"am dumpheap: dump the heap of a process. Options are:\n" +
		" -n: dump native heap instead of managed heap\n" +
		"\n" +
		"am set-debug-app: set application <PACKAGE> to debug. Options are:\n" +
		" -w: wait for debugger when application starts\n" +
		" --persistent: retain this value\n" +
		"\n" +
		"am clear-debug-app: clear the previously set-debug-app.\n" +
		"\n" +
		"am monitor: start monitoring for crashes or ANRs.\n" +
		" --gdb: start gdbserv on the given port at crash/ANR\n" +
		"\n" +
		@@ -1213,6 +1318,10 @@ public class Am {
		"\n" +
		"am display-size: override display size.\n" +
		"\n" +
		"am to-uri: print the given Intent specification as a URI.\n" +
		"\n" +
		"am to-intent-uri: print the given Intent specification as an intent: URI.\n" +
		"\n" +
		"<INTENT> specifications include these flags and arguments:\n" +
		" [-a <ACTION>] [-d <DATA_URI>] [-t <MIME_TYPE>]\n" +
		" [-c <CATEGORY> [-c <CATEGORY>] ...]\n" +
		@@ -1237,6 +1346,7 @@ public class Am {
		" [--activity-single-top] [--activity-clear-task]\n" +
		" [--activity-task-on-home]\n" +
		" [--receiver-registered-only] [--receiver-replace-pending]\n" +
		" [--selector]\n" +
		" [<URI> \| <PACKAGE> \| <COMPONENT>]\n"
		);
		}

cmds/bootanimation/BootAnimation.cpp

+10 −3

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@
		#include <surfaceflinger/ISurfaceComposerClient.h>

		#include <core/SkBitmap.h>
		#include <core/SkStream.h>
		#include <images/SkImageDecoder.h>

		#include <GLES/gl.h>
		@@ -150,9 +151,15 @@ status_t BootAnimation::initTexture(void* buffer, size_t len)
		//StopWatch watch("blah");

		SkBitmap bitmap;
		SkImageDecoder::DecodeMemory(buffer, len,
		&bitmap, SkBitmap::kRGB_565_Config,
		SkMemoryStream stream(buffer, len);
		SkImageDecoder* codec = SkImageDecoder::Factory(&stream);
		codec->setDitherImage(false);
		if (codec) {
		codec->decode(&stream, &bitmap,
		SkBitmap::kRGB_565_Config,
		SkImageDecoder::kDecodePixels_Mode);
		delete codec;
		}

		// ensure we can call getPixels(). No need to call unlock, since the
		// bitmap will go out of scope when we return from this method.