Merge changes from topic 'am_instrument' (2f99e60d) · Commits · e / os / android_frameworks_base

cmds/am/Android.mk

+15 −1

Original line number	Diff line number	Diff line
		@@ -3,8 +3,11 @@
		LOCAL_PATH:= $(call my-dir)

		include $(CLEAR_VARS)
		LOCAL_SRC_FILES := $(call all-subdir-java-files)
		LOCAL_SRC_FILES := \
		$(call all-java-files-under, src) \
		$(call all-proto-files-under, proto)
		LOCAL_MODULE := am
		LOCAL_PROTOC_OPTIMIZE_TYPE := stream
		include $(BUILD_JAVA_LIBRARY)

		include $(CLEAR_VARS)
		@@ -13,3 +16,14 @@ LOCAL_SRC_FILES := am
		LOCAL_MODULE_CLASS := EXECUTABLES
		LOCAL_MODULE_TAGS := optional
		include $(BUILD_PREBUILT)


		include $(CLEAR_VARS)
		LOCAL_SRC_FILES := \
		$(call all-proto-files-under, proto)
		LOCAL_MODULE := libinstrumentation
		LOCAL_PROTOC_OPTIMIZE_TYPE := full
		LOCAL_EXPORT_C_INCLUDE_DIRS := \
		$(call intermediates-dir-for,STATIC_LIBRARIES,libinstrumentation,HOST,,,)/proto/$(LOCAL_PATH)/proto
		include $(BUILD_HOST_STATIC_LIBRARY)

cmds/am/proto/instrumentation_data.proto

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		syntax = "proto2";
		package android.am;

		option java_package = "com.android.commands.am";

		message ResultsBundleEntry {
		optional string key = 1;

		optional string value_string = 2;
		optional sint32 value_int = 3;
		optional float value_float = 4;
		optional double value_double = 5;
		optional sint64 value_long = 6;
		optional ResultsBundle value_bundle = 7;
		}

		message ResultsBundle {
		repeated ResultsBundleEntry entries = 1;
		}

		message TestStatus {
		optional sint32 result_code = 3;
		optional ResultsBundle results = 4;
		}

		enum SessionStatusCode {
		/**
		* The command ran successfully. This does not imply that the tests passed.
		*/
		SESSION_FINISHED = 0;

		/**
		* There was an unrecoverable error running the tests.
		*/
		SESSION_ABORTED = 1;
		}

		message SessionStatus {
		optional SessionStatusCode status_code = 1;
		optional string error_text = 2;
		optional sint32 result_code = 3;
		optional ResultsBundle results = 4;
		}

		message Session {
		repeated TestStatus test_status = 1;
		optional SessionStatus session_status = 2;
		}

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

+31 −197

Original line number	Diff line number	Diff line
		/*
		**
		** Copyright 2007, The Android Open Source Project
		**
		** Licensed under the Apache License, Version 2.0 (the "License");
		** you may not use this file except in compliance with the License.
		** You may obtain a copy of the License at
		**
		** http://www.apache.org/licenses/LICENSE-2.0
		**
		** Unless required by applicable law or agreed to in writing, software
		** distributed under the License is distributed on an "AS IS" BASIS,
		** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		** See the License for the specific language governing permissions and
		** limitations under the License.
		* Copyright (C) 2007 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/


		package com.android.commands.am;

		import static android.app.ActivityManager.RESIZE_MODE_SYSTEM;
		@@ -235,6 +233,7 @@ public class Am extends BaseCommand {
		" -e <NAME> <VALUE>: set argument <NAME> to <VALUE>. For test runners a\n" +
		" common form is [-e <testrunner_flag> <value>[,<value>...]].\n" +
		" -p <FILE>: write profiling data to <FILE>\n" +
		" -m: Write output as protobuf (machine readable)\n" +
		" -w: wait for instrumentation to finish before returning. Required for\n" +
		" test runners.\n" +
		" --user <USER_ID> \| current: Specify user instrumentation runs in;\n" +
		@@ -543,208 +542,43 @@ public class Am extends BaseCommand {
		receiver.waitForFinish();
		}

		private void runInstrument() throws Exception {
		String profileFile = null;
		boolean wait = false;
		boolean rawMode = false;
		boolean no_window_animation = false;
		int userId = UserHandle.USER_CURRENT;
		Bundle args = new Bundle();
		String argKey = null, argValue = null;
		IWindowManager wm = IWindowManager.Stub.asInterface(ServiceManager.getService("window"));
		String abi = null;
		public void runInstrument() throws Exception {
		Instrument instrument = new Instrument(mAm, mPm);

		String opt;
		while ((opt=nextOption()) != null) {
		if (opt.equals("-p")) {
		profileFile = nextArgRequired();
		instrument.profileFile = nextArgRequired();
		} else if (opt.equals("-w")) {
		wait = true;
		instrument.wait = true;
		} else if (opt.equals("-r")) {
		rawMode = true;
		instrument.rawMode = true;
		} else if (opt.equals("-m")) {
		instrument.proto = true;
		} else if (opt.equals("-e")) {
		argKey = nextArgRequired();
		argValue = nextArgRequired();
		args.putString(argKey, argValue);
		final String argKey = nextArgRequired();
		final String argValue = nextArgRequired();
		instrument.args.putString(argKey, argValue);
		} else if (opt.equals("--no_window_animation")
		\|\| opt.equals("--no-window-animation")) {
		no_window_animation = true;
		instrument.noWindowAnimation = true;
		} else if (opt.equals("--user")) {
		userId = parseUserArg(nextArgRequired());
		instrument.userId = parseUserArg(nextArgRequired());
		} else if (opt.equals("--abi")) {
		abi = nextArgRequired();
		instrument.abi = nextArgRequired();
		} else {
		System.err.println("Error: Unknown option: " + opt);
		return;
		}
		}

		if (userId == UserHandle.USER_ALL) {
		if (instrument.userId == UserHandle.USER_ALL) {
		System.err.println("Error: Can't start instrumentation with user 'all'");
		return;
		}

		String cnArg = nextArgRequired();

		ComponentName cn;
		if (cnArg.contains("/")) {
		cn = ComponentName.unflattenFromString(cnArg);
		if (cn == null) throw new IllegalArgumentException("Bad component name: " + cnArg);
		} else {
		List<InstrumentationInfo> infos = mPm.queryInstrumentation(null, 0).getList();

		final int numInfos = infos == null ? 0: infos.size();
		List<ComponentName> cns = new ArrayList<>();
		for (int i = 0; i < numInfos; i++) {
		InstrumentationInfo info = infos.get(i);

		ComponentName c = new ComponentName(info.packageName, info.name);
		if (cnArg.equals(info.packageName)) {
		cns.add(c);
		}
		}

		if (cns.size() == 0) {
		throw new IllegalArgumentException("No instrumentation found for: " + cnArg);
		} else if (cns.size() == 1) {
		cn = cns.get(0);
		} else {
		StringBuilder cnsStr = new StringBuilder();
		final int numCns = cns.size();
		for (int i = 0; i < numCns; i++) {
		cnsStr.append(cns.get(i).flattenToString());
		cnsStr.append(", ");
		}

		// Remove last ", "
		cnsStr.setLength(cnsStr.length() - 2);

		throw new IllegalArgumentException("Found multiple instrumentations: "
		+ cnsStr.toString());
		}
		}

		InstrumentationWatcher watcher = null;
		UiAutomationConnection connection = null;
		if (wait) {
		watcher = new InstrumentationWatcher();
		watcher.setRawOutput(rawMode);
		connection = new UiAutomationConnection();
		}

		float[] oldAnims = null;
		if (no_window_animation) {
		oldAnims = wm.getAnimationScales();
		wm.setAnimationScale(0, 0.0f);
		wm.setAnimationScale(1, 0.0f);
		}

		if (abi != null) {
		final String[] supportedAbis = Build.SUPPORTED_ABIS;
		boolean matched = false;
		for (String supportedAbi : supportedAbis) {
		if (supportedAbi.equals(abi)) {
		matched = true;
		break;
		}
		}

		if (!matched) {
		throw new AndroidException(
		"INSTRUMENTATION_FAILED: Unsupported instruction set " + abi);
		}
		}

		if (!mAm.startInstrumentation(cn, profileFile, 0, args, watcher, connection, userId, abi)) {
		throw new AndroidException("INSTRUMENTATION_FAILED: " + cn.flattenToString());
		}
		instrument.componentNameArg = nextArgRequired();

		if (watcher != null) {
		if (!watcher.waitForFinish()) {
		System.out.println("INSTRUMENTATION_ABORTED: System has crashed.");
		}
		}

		if (oldAnims != null) {
		wm.setAnimationScales(oldAnims);
		}
		}

		private class InstrumentationWatcher extends IInstrumentationWatcher.Stub {
		private boolean mFinished = false;
		private boolean mRawMode = false;

		/**
		* Set or reset "raw mode". In "raw mode", all bundles are dumped. In "pretty mode",
		* if a bundle includes Instrumentation.REPORT_KEY_STREAMRESULT, just print that.
		* @param rawMode true for raw mode, false for pretty mode.
		*/
		public void setRawOutput(boolean rawMode) {
		mRawMode = rawMode;
		}

		@Override
		public void instrumentationStatus(ComponentName name, int resultCode, Bundle results) {
		synchronized (this) {
		// pretty printer mode?
		String pretty = null;
		if (!mRawMode && results != null) {
		pretty = results.getString(Instrumentation.REPORT_KEY_STREAMRESULT);
		}
		if (pretty != null) {
		System.out.print(pretty);
		} else {
		if (results != null) {
		for (String key : results.keySet()) {
		System.out.println(
		"INSTRUMENTATION_STATUS: " + key + "=" + results.get(key));
		}
		}
		System.out.println("INSTRUMENTATION_STATUS_CODE: " + resultCode);
		}
		notifyAll();
		}
		}

		@Override
		public void instrumentationFinished(ComponentName name, int resultCode,
		Bundle results) {
		synchronized (this) {
		// pretty printer mode?
		String pretty = null;
		if (!mRawMode && results != null) {
		pretty = results.getString(Instrumentation.REPORT_KEY_STREAMRESULT);
		}
		if (pretty != null) {
		System.out.println(pretty);
		} else {
		if (results != null) {
		for (String key : results.keySet()) {
		System.out.println(
		"INSTRUMENTATION_RESULT: " + key + "=" + results.get(key));
		}
		}
		System.out.println("INSTRUMENTATION_CODE: " + resultCode);
		}
		mFinished = true;
		notifyAll();
		}
		}

		public boolean waitForFinish() {
		synchronized (this) {
		while (!mFinished) {
		try {
		if (!mAm.asBinder().pingBinder()) {
		return false;
		}
		wait(1000);
		} catch (InterruptedException e) {
		throw new IllegalStateException(e);
		}
		}
		}
		return true;
		}
		instrument.run();
		}
		}

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

0 → 100644

+435 −0

File added.

Preview size limit exceeded, changes collapsed.

tools/bit/Android.mk

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		#
		# Copyright (C) 2015 The Android Open Source Project
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		# You may obtain a copy of the License at
		#
		# http://www.apache.org/licenses/LICENSE-2.0
		#
		# Unless required by applicable law or agreed to in writing, software
		# distributed under the License is distributed on an "AS IS" BASIS,
		# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		# See the License for the specific language governing permissions and
		# limitations under the License.
		#
		LOCAL_PATH:= $(call my-dir)

		# ==========================================================
		# Build the host executable: protoc-gen-javastream
		# ==========================================================
		include $(CLEAR_VARS)

		LOCAL_MODULE := bit

		LOCAL_SRC_FILES := \
		aapt.cpp \
		adb.cpp \
		command.cpp \
		main.cpp \
		make.cpp \
		print.cpp \
		util.cpp

		LOCAL_STATIC_LIBRARIES := \
		libexpat \
		libinstrumentation \
		libjsoncpp

		LOCAL_SHARED_LIBRARIES := \
		libprotobuf-cpp-full

		include $(BUILD_HOST_EXECUTABLE)