Snap for 7277590 from b62e707e65b7411171a82a61a7c4bf46dd3eaeb2 to sc-release (0e2eaf5c) · Commits · e / os / android_frameworks_native

cmds/dumpstate/dumpstate.cpp

+10 −8

Original line number	Diff line number	Diff line
		@@ -2175,14 +2175,13 @@ void Dumpstate::DumpstateBoard(int out_fd) {
		}

		/*
		* mount debugfs for non-user builds which launch with S and unmount it
		* after invoking dumpstateBoard_* methods. This is to enable debug builds
		* to not have debugfs mounted during runtime. It will also ensure that
		* debugfs is only accessed by the dumpstate HAL.
		* mount debugfs for non-user builds with ro.product.enforce_debugfs_restrictions
		* set to true and unmount it after invoking dumpstateBoard_* methods.
		* This is to enable debug builds to not have debugfs mounted during runtime.
		* It will also ensure that debugfs is only accessed by the dumpstate HAL.
		*/
		auto api_level = android::base::GetIntProperty("ro.product.first_api_level", 0);
		bool mount_debugfs = !PropertiesHelper::IsUserBuild() && api_level >= 31;

		auto mount_debugfs =
		android::base::GetBoolProperty("ro.product.enforce_debugfs_restrictions", false);
		if (mount_debugfs) {
		RunCommand("mount debugfs", {"mount", "-t", "debugfs", "debugfs", "/sys/kernel/debug"},
		AS_ROOT_20);
		@@ -2290,6 +2289,9 @@ void Dumpstate::DumpstateBoard(int out_fd) {
		}

		if (mount_debugfs) {
		auto keep_debugfs_mounted =
		android::base::GetProperty("persist.dbg.keep_debugfs_mounted", "");
		if (keep_debugfs_mounted.empty())
		RunCommand("unmount debugfs", {"umount", "/sys/kernel/debug"}, AS_ROOT_20);
		}

deleted100644 → 0

+0 −19

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

		<permissions>
		<feature name="android.software.translation" />
		</permissions>

+0 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,6 @@
		<feature name="android.software.autofill" />
		<feature name="android.software.cant_save_state" />
		<feature name="android.software.secure_lock_screen" />
		<feature name="android.software.translation" />

		<!-- Feature to specify if the device supports adding device admins. -->
		<feature name="android.software.device_admin" />

+0 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,6 @@
		<feature name="android.software.autofill" />
		<feature name="android.software.cant_save_state" />
		<feature name="android.software.secure_lock_screen" />
		<feature name="android.software.translation" />

		<!-- Feature to specify if the device supports adding device admins. -->
		<feature name="android.software.device_admin" />

+55 −6

Original line number	Diff line number	Diff line
		@@ -39,12 +39,50 @@ cc_library_headers {
		min_sdk_version: "29",
		}

		cc_library_headers {
		name: "libgui_aidl_headers",
		vendor_available: true,
		static_libs: [
		"libgui_aidl_static",
		],

		export_static_lib_headers: [
		"libgui_aidl_static",
		],
		}

		filegroup {
		name: "libgui_aidl",
		srcs: ["aidl/*/.aidl"],
		path: "aidl/",
		}

		cc_library_static {
		name: "libgui_aidl_static",
		vendor_available: true,
		srcs: [
		":libgui_aidl",
		],

		shared_libs: [
		"libbinder",
		"libui",
		],

		local_include_dirs: [
		"include",
		],

		export_shared_lib_headers: [
		"libbinder",
		],

		aidl: {
		export_aidl_headers: true
		}
		}


		cc_library_shared {
		name: "libgui",
		vendor_available: true,
		@@ -56,10 +94,16 @@ cc_library_shared {

		defaults: ["libgui_bufferqueue-defaults"],

		static_libs: [
		"libgui_aidl_static",
		],
		export_static_lib_headers: [
		"libgui_aidl_static",
		],

		srcs: [
		":framework_native_aidl",
		":inputconstants_aidl",
		":libgui_aidl",
		":libgui_bufferqueue_sources",

		"BitTube.cpp",
		@@ -115,6 +159,10 @@ cc_library_shared {
		"libinput",
		],

		export_header_lib_headers: [
		"libgui_aidl_headers",
		],

		// bufferhub is not used when building libgui for vendors
		target: {
		vendor: {
		@@ -136,15 +184,16 @@ cc_library_shared {
		},
		},

		aidl: {
		export_aidl_headers: true,
		},

		header_libs: [
		"libdvr_headers",
		"libgui_aidl_headers",
		"libpdx_headers",
		],

		aidl: {
		export_aidl_headers: true,
		},

		pgo: {
		sampling: true,
		profile_file: "libgui/libgui.profdata",
		@@ -175,8 +224,8 @@ cc_library_static {

		srcs: [
		":inputconstants_aidl",
		":libgui_aidl",
		":libgui_bufferqueue_sources",
		":libgui_aidl",
		],
		}