Merge commit '26cc3d0b67ff4daf31eaeed0ecd87b391978aadb' into HEAD (28d41f56) · Commits · e / os / android_frameworks_native

build/tablet-7in-hdpi-1024-dalvik-heap.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@

		PRODUCT_PROPERTY_OVERRIDES += \
		dalvik.vm.heapstartsize=8m \
		dalvik.vm.heapgrowthlimit=64m \
		dalvik.vm.heapgrowthlimit=80m \
		dalvik.vm.heapsize=384m \
		dalvik.vm.heaptargetutilization=0.75 \
		dalvik.vm.heapminfree=512k \

cmds/atrace/atrace.cpp

+9 −9

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ static const TracingCategory k_categories[] = {
		{ "webview", "WebView", ATRACE_TAG_WEBVIEW, { } },
		{ "wm", "Window Manager", ATRACE_TAG_WINDOW_MANAGER, { } },
		{ "am", "Activity Manager", ATRACE_TAG_ACTIVITY_MANAGER, { } },
		{ "sync", "Sync Manager", ATRACE_TAG_SYNC_MANAGER, { } },
		{ "sm", "Sync Manager", ATRACE_TAG_SYNC_MANAGER, { } },
		{ "audio", "Audio", ATRACE_TAG_AUDIO, { } },
		{ "video", "Video", ATRACE_TAG_VIDEO, { } },
		{ "camera", "Camera", ATRACE_TAG_CAMERA, { } },
		@@ -107,14 +107,14 @@ static const TracingCategory k_categories[] = {
		{ REQ, "/sys/kernel/debug/tracing/events/power/cpu_idle/enable" },
		} },
		{ "disk", "Disk I/O", 0, {
		{ REQ, "/sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_enter/enable" },
		{ REQ, "/sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_exit/enable" },
		{ REQ, "/sys/kernel/debug/tracing/events/f2fs/f2fs_write_begin/enable" },
		{ REQ, "/sys/kernel/debug/tracing/events/f2fs/f2fs_write_end/enable" },
		{ REQ, "/sys/kernel/debug/tracing/events/ext4/ext4_da_write_begin/enable" },
		{ REQ, "/sys/kernel/debug/tracing/events/ext4/ext4_da_write_end/enable" },
		{ REQ, "/sys/kernel/debug/tracing/events/ext4/ext4_sync_file_enter/enable" },
		{ REQ, "/sys/kernel/debug/tracing/events/ext4/ext4_sync_file_exit/enable" },
		{ OPT, "/sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_enter/enable" },
		{ OPT, "/sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_exit/enable" },
		{ OPT, "/sys/kernel/debug/tracing/events/f2fs/f2fs_write_begin/enable" },
		{ OPT, "/sys/kernel/debug/tracing/events/f2fs/f2fs_write_end/enable" },
		{ OPT, "/sys/kernel/debug/tracing/events/ext4/ext4_da_write_begin/enable" },
		{ OPT, "/sys/kernel/debug/tracing/events/ext4/ext4_da_write_end/enable" },
		{ OPT, "/sys/kernel/debug/tracing/events/ext4/ext4_sync_file_enter/enable" },
		{ OPT, "/sys/kernel/debug/tracing/events/ext4/ext4_sync_file_exit/enable" },
		{ REQ, "/sys/kernel/debug/tracing/events/block/block_rq_issue/enable" },
		{ REQ, "/sys/kernel/debug/tracing/events/block/block_rq_complete/enable" },
		} },

cmds/dumpstate/dumpstate.c

+25 −3

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		* limitations under the License.
		*/

		#include <dirent.h>
		#include <errno.h>
		#include <fcntl.h>
		#include <limits.h>
		@@ -75,6 +76,28 @@ static void get_tombstone_fds(tombstone_data_t data[NUM_TOMBSTONES]) {
		}
		}

		static void dump_dev_files(const char title, const char driverpath, const char *filename)
		{
		DIR *d;
		struct dirent *de;
		char path[PATH_MAX];

		d = opendir(driverpath);
		if (d == NULL) {
		return;
		}

		while ((de = readdir(d))) {
		if (de->d_type != DT_LNK) {
		continue;
		}
		snprintf(path, sizeof(path), "%s/%s/%s", driverpath, de->d_name, filename);
		dump_file(title, path);
		}

		closedir(d);
		}

		/* dumps the current system state to stdout */
		static void dumpstate() {
		time_t now = time(NULL);
		@@ -107,7 +130,9 @@ static void dumpstate() {
		printf("Command line: %s\n", strtok(cmdline_buf, "\n"));
		printf("\n");

		dump_dev_files("TRUSTY VERSION", "/sys/bus/platform/drivers/trusty", "trusty_version");
		run_command("UPTIME", 10, "uptime", NULL);
		dump_file("MMC PERF", "/sys/block/mmcblk0/stat");
		dump_file("MEMORY INFO", "/proc/meminfo");
		run_command("CPU INFO", 10, "top", "-n", "1", "-d", "1", "-m", "30", "-t", NULL);
		run_command("PROCRANK", 20, "procrank", NULL);
		@@ -271,9 +296,6 @@ static void dumpstate() {

		run_command("FILESYSTEMS & FREE SPACE", 10, "df", NULL);

		run_command("PACKAGE SETTINGS", 20, SU_PATH, "root", "cat", "/data/system/packages.xml", NULL);
		dump_file("PACKAGE UID ERRORS", "/data/system/uiderrors.txt");

		run_command("LAST RADIO LOG", 10, "parse_radio_log", "/proc/last_radio_log", NULL);

		printf("------ BACKLIGHTS ------\n");

cmds/installd/commands.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include <cutils/sched_policy.h>
		#include <diskusage/dirsize.h>
		#include <selinux/android.h>
		#include <system/thread_defs.h>

		/* Directory records that are used in execution of commands. */
		dir_rec_t android_data_dir;
		@@ -1060,6 +1061,10 @@ int dexopt(const char *apk_path, uid_t uid, bool is_public,
		ALOGE("set_sched_policy failed: %s\n", strerror(errno));
		exit(70);
		}
		if (setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_BACKGROUND) < 0) {
		ALOGE("setpriority failed: %s\n", strerror(errno));
		exit(71);
		}
		if (flock(out_fd, LOCK_EX \| LOCK_NB) != 0) {
		ALOGE("flock(%s) failed: %s\n", out_path, strerror(errno));
		exit(67);

data/etc/android.hardware.camera.manual_postprocessing.xml

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2014 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.
		-->

		<!-- This is the set of features required for a camera2 device that supports manual postprocessing capability -->
		<permissions>
		<feature name="android.hardware.camera.any" />
		<feature name="android.hardware.camera.capability.manual_post_processing" />
		</permissions>