Snap for 9781601 from b07299d20a4edce6c2ec98629d29072d8a29c31c to udc-release (78bae2ee) · Commits · e / os / platform_frameworks_native

cmds/dumpstate/dumpstate.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -1273,6 +1273,9 @@ static Dumpstate::RunStatus RunDumpsysTextByPriority(const std::string& title, i
		dumpsys.writeDumpFooter(STDOUT_FILENO, service, elapsed_seconds);
		bool dump_complete = (status == OK);
		dumpsys.stopDumpThread(dump_complete);
		} else {
		MYLOGE("Failed to start dump thread for service: %s, status: %d",
		String8(service).c_str(), status);
		}
		}

data/etc/Android.bp

+96 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,12 @@ prebuilt_etc {
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.context_hub.prebuilt.xml",
		src: "android.hardware.context_hub.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.ethernet.prebuilt.xml",
		src: "android.hardware.ethernet.xml",
		@@ -106,30 +112,102 @@ prebuilt_etc {
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.accelerometer_limited_axes_uncalibrated.prebuilt.xml",
		src: "android.hardware.sensor.accelerometer_limited_axes_uncalibrated.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.accelerometer_limited_axes.prebuilt.xml",
		src: "android.hardware.sensor.accelerometer_limited_axes.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.accelerometer.prebuilt.xml",
		src: "android.hardware.sensor.accelerometer.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.ambient_temperature.prebuilt.xml",
		src: "android.hardware.sensor.ambient_temperature.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.assist.prebuilt.xml",
		src: "android.hardware.sensor.assist.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.barometer.prebuilt.xml",
		src: "android.hardware.sensor.barometer.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.compass.prebuilt.xml",
		src: "android.hardware.sensor.compass.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.dynamic.head_tracker.prebuilt.xml",
		src: "android.hardware.sensor.dynamic.head_tracker.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.gyroscope_limited_axes_uncalibrated.prebuilt.xml",
		src: "android.hardware.sensor.gyroscope_limited_axes_uncalibrated.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.gyroscope_limited_axes.prebuilt.xml",
		src: "android.hardware.sensor.gyroscope_limited_axes.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.gyroscope.prebuilt.xml",
		src: "android.hardware.sensor.gyroscope.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.heading.prebuilt.xml",
		src: "android.hardware.sensor.heading.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.heartrate.ecg.prebuilt.xml",
		src: "android.hardware.sensor.heartrate.ecg.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.heartrate.fitness.prebuilt.xml",
		src: "android.hardware.sensor.heartrate.fitness.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.heartrate.prebuilt.xml",
		src: "android.hardware.sensor.heartrate.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.hifi_sensors.prebuilt.xml",
		src: "android.hardware.sensor.hifi_sensors.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.hinge_angle.prebuilt.xml",
		src: "android.hardware.sensor.hinge_angle.xml",
		@@ -154,6 +232,18 @@ prebuilt_etc {
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.stepcounter.prebuilt.xml",
		src: "android.hardware.sensor.stepcounter.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.sensor.stepdetector.prebuilt.xml",
		src: "android.hardware.sensor.stepdetector.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.telephony.gsm.prebuilt.xml",
		src: "android.hardware.telephony.gsm.xml",
		@@ -166,6 +256,12 @@ prebuilt_etc {
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.telephony.satellite.prebuilt.xml",
		src: "android.hardware.telephony.satellite.xml",
		defaults: ["frameworks_native_data_etc_defaults"],
		}

		prebuilt_etc {
		name: "android.hardware.usb.accessory.prebuilt.xml",
		src: "android.hardware.usb.accessory.xml",

data/etc/android.hardware.telephony.satellite.xml

0 → 100644

+20 −0

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

		<!-- Feature for devices that support satellite communication via satellite vendor service APIs. -->
		<permissions>
		<feature name="android.hardware.telephony.satellite" />
		</permissions>

libs/binder/Android.bp

+3 −1

Original line number	Diff line number	Diff line
		@@ -355,6 +355,7 @@ cc_library {

		cc_library_static {
		name: "libbinder_rpc_no_kernel",
		vendor_available: true,
		defaults: [
		"libbinder_common_defaults",
		"libbinder_android_defaults",
		@@ -407,6 +408,7 @@ cc_defaults {
		cc_defaults {
		name: "libbinder_tls_defaults",
		defaults: ["libbinder_tls_shared_deps"],
		vendor_available: true,
		host_supported: true,

		header_libs: [
		@@ -433,7 +435,7 @@ cc_library_shared {
		defaults: ["libbinder_tls_defaults"],
		}

		cc_library_shared {
		cc_library {
		name: "libbinder_trusty",
		vendor: true,
		srcs: [

libs/binder/ndk/tests/libbinder_ndk_unit_test.cpp

+32 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ constexpr char kBinderNdkUnitTestService[] = "BinderNdkUnitTest";
		constexpr char kLazyBinderNdkUnitTestService[] = "LazyBinderNdkUnitTest";
		constexpr char kForcePersistNdkUnitTestService[] = "ForcePersistNdkUnitTestService";
		constexpr char kActiveServicesNdkUnitTestService[] = "ActiveServicesNdkUnitTestService";
		constexpr char kBinderNdkUnitTestServiceFlagged[] = "BinderNdkUnitTestFlagged";

		constexpr unsigned int kShutdownWaitTime = 11;
		constexpr uint64_t kContextTestValue = 0xb4e42fb4d9a1d715;
		@@ -158,6 +159,24 @@ int generatedService() {
		return 1; // should not return
		}

		int generatedFlaggedService(const AServiceManager_AddServiceFlag flags, const char* instance) {
		ABinderProcess_setThreadPoolMaxThreadCount(0);

		auto service = ndk::SharedRefBase::make<MyBinderNdkUnitTest>();
		auto binder = service->asBinder();

		binder_exception_t exception =
		AServiceManager_addServiceWithFlags(binder.get(), instance, flags);

		if (exception != EX_NONE) {
		LOG(FATAL) << "Could not register: " << exception << " " << instance;
		}

		ABinderProcess_joinThreadPool();

		return 1; // should not return
		}

		// manually-written parceling class considered bad practice
		class MyFoo : public IFoo {
		binder_status_t doubleNumber(int32_t in, int32_t* out) override {
		@@ -847,6 +866,12 @@ TEST(NdkBinder, UseHandleShellCommand) {
		EXPECT_EQ("CMD", shellCmdToString(testService, {"C", "M", "D"}));
		}

		TEST(NdkBinder, FlaggedServiceAccessible) {
		static const sp<android::IServiceManager> sm(android::defaultServiceManager());
		sp<IBinder> testService = sm->getService(String16(kBinderNdkUnitTestServiceFlagged));
		ASSERT_NE(nullptr, testService);
		}

		TEST(NdkBinder, GetClassInterfaceDescriptor) {
		ASSERT_STREQ(IFoo::kIFooDescriptor, AIBinder_Class_getDescriptor(IFoo::kClass));
		}
		@@ -901,6 +926,13 @@ int main(int argc, char* argv[]) {
		prctl(PR_SET_PDEATHSIG, SIGHUP);
		return generatedService();
		}
		if (fork() == 0) {
		prctl(PR_SET_PDEATHSIG, SIGHUP);
		// We may want to change this flag to be more generic ones for the future
		AServiceManager_AddServiceFlag test_flags =
		AServiceManager_AddServiceFlag::ADD_SERVICE_ALLOW_ISOLATED;
		return generatedFlaggedService(test_flags, kBinderNdkUnitTestServiceFlagged);
		}

		ABinderProcess_setThreadPoolMaxThreadCount(1); // to receive death notifications/callbacks
		ABinderProcess_startThreadPool();