Snap for 4517567 from 3a74e1428a75fdc6c519523a0da5ffd86e3001d1 to pi-release (04afc00a) · Commits · e / os / android_frameworks_native

cmds/dumpstate/dumpstate.cpp

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -1191,19 +1191,6 @@ static void dumpstate() {

	RunCommand("LAST RADIO LOG", {"parse_radio_log", "/proc/last_radio_log"});		RunCommand("LAST RADIO LOG", {"parse_radio_log", "/proc/last_radio_log"});

	printf("------ BACKLIGHTS ------\n");
	printf("LCD brightness=");
	DumpFile("", "/sys/class/leds/lcd-backlight/brightness");
	printf("Button brightness=");
	DumpFile("", "/sys/class/leds/button-backlight/brightness");
	printf("Keyboard brightness=");
	DumpFile("", "/sys/class/leds/keyboard-backlight/brightness");
	printf("ALS mode=");
	DumpFile("", "/sys/class/leds/lcd-backlight/als");
	printf("LCD driver registers:\n");
	DumpFile("", "/sys/class/leds/lcd-backlight/registers");
	printf("\n");

	/* Binder state is expensive to look at as it uses a lot of memory. */		/* Binder state is expensive to look at as it uses a lot of memory. */
	DumpFile("BINDER FAILED TRANSACTION LOG", "/sys/kernel/debug/binder/failed_transaction_log");		DumpFile("BINDER FAILED TRANSACTION LOG", "/sys/kernel/debug/binder/failed_transaction_log");
	DumpFile("BINDER TRANSACTION LOG", "/sys/kernel/debug/binder/transaction_log");		DumpFile("BINDER TRANSACTION LOG", "/sys/kernel/debug/binder/transaction_log");

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -963,7 +963,7 @@ static std::string replace_file_extension(const std::string& oat_path, const std
	if (EndsWith(oat_path, ".dex")) {		if (EndsWith(oat_path, ".dex")) {
	std::string new_path = oat_path;		std::string new_path = oat_path;
	new_path.replace(new_path.length() - strlen(".dex"), strlen(".dex"), new_ext);		new_path.replace(new_path.length() - strlen(".dex"), strlen(".dex"), new_ext);
	CHECK(EndsWith(new_path, new_ext.c_str()));		CHECK(EndsWith(new_path, new_ext));
	return new_path;		return new_path;
	}		}

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -882,7 +882,7 @@ private:
	// backs to do weird things.)		// backs to do weird things.)
	const char* apk_path = package_parameters_.apk_path;		const char* apk_path = package_parameters_.apk_path;
	CHECK(apk_path != nullptr);		CHECK(apk_path != nullptr);
	if (StartsWith(apk_path, android_root_.c_str())) {		if (StartsWith(apk_path, android_root_)) {
	const char* last_slash = strrchr(apk_path, '/');		const char* last_slash = strrchr(apk_path, '/');
	if (last_slash != nullptr) {		if (last_slash != nullptr) {
	std::string path(apk_path, last_slash - apk_path + 1);		std::string path(apk_path, last_slash - apk_path + 1);

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -86,6 +86,12 @@ sp<ProcessState> ProcessState::initWithDriver(const char* driver)
	}		}
	LOG_ALWAYS_FATAL("ProcessState was already initialized.");		LOG_ALWAYS_FATAL("ProcessState was already initialized.");
	}		}

			if (access(driver, R_OK) == -1) {
			ALOGE("Binder driver %s is unavailable. Using /dev/binder instead.", driver);
			driver = "/dev/binder";
			}

	gProcess = new ProcessState(driver);		gProcess = new ProcessState(driver);
	return gProcess;		return gProcess;
	}		}
	@@ -420,7 +426,7 @@ ProcessState::ProcessState(const char *driver)
	mVMStart = mmap(0, BINDER_VM_SIZE, PROT_READ, MAP_PRIVATE \| MAP_NORESERVE, mDriverFD, 0);		mVMStart = mmap(0, BINDER_VM_SIZE, PROT_READ, MAP_PRIVATE \| MAP_NORESERVE, mDriverFD, 0);
	if (mVMStart == MAP_FAILED) {		if (mVMStart == MAP_FAILED) {
	// sigh		// sigh
	ALOGE("Using /dev/binder failed: unable to mmap transaction memory.\n");		ALOGE("Using %s failed: unable to mmap transaction memory.\n", mDriverName.c_str());
	close(mDriverFD);		close(mDriverFD);
	mDriverFD = -1;		mDriverFD = -1;
	mDriverName.clear();		mDriverName.clear();

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -47,6 +47,8 @@ cc_library {
	"-std=c++1z"		"-std=c++1z"
	],		],

			version_script: "libnativewindow.map.txt",

	srcs: [		srcs: [
	"AHardwareBuffer.cpp",		"AHardwareBuffer.cpp",
	"ANativeWindow.cpp",		"ANativeWindow.cpp",