Snap for 7171598 from d9d0d32eada2c9d5e5a73decc1c09e941804fd7e to sc-release (3a8b5b2d) · Commits · e / os / android_frameworks_av

Android.bp

+0 −36

Original line number	Diff line number	Diff line
		// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE
		// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
		// DEPENDING ON IT IN YOUR PROJECT. ***
		package {
		default_applicable_licenses: ["frameworks_av_license"],
		}

		// Added automatically by a large-scale-change that took the approach of
		// 'apply every license found to every target'. While this makes sure we respect
		// every license restriction, it may not be entirely correct.
		//
		// e.g. GPL in an MIT project might only apply to the contrib/ directory.
		//
		// Please consider splitting the single license below into multiple licenses,
		// taking care not to lose any license_kind information, and overriding the
		// default license using the 'licenses: [...]' property on targets as needed.
		//
		// For unused files, consider creating a 'fileGroup' with "//visibility:private"
		// to attach the license to, and including a comment whether the files may be
		// used in the current project.
		// See: http://go/android-license-faq
		license {
		name: "frameworks_av_license",
		visibility: [":__subpackages__"],
		license_kinds: [
		"SPDX-license-identifier-Apache-2.0",
		"SPDX-license-identifier-BSD",
		"SPDX-license-identifier-MIT",
		"SPDX-license-identifier-Unicode-DFS",
		"legacy_by_exception_only", // by exception only
		],
		license_text: [
		"NOTICE",
		],
		}

		aidl_interface {
		name: "av-types-aidl",
		unstable: true,

+0 −9

Original line number	Diff line number	Diff line
		@@ -12,15 +12,6 @@
		// See the License for the specific language governing permissions and
		// limitations under the License.

		package {
		// See: http://go/android-license-faq
		// A large-scale-change added 'default_applicable_licenses' to import
		// all of the 'license_kinds' from "frameworks_av_license"
		// to get the below license kinds:
		// SPDX-license-identifier-Apache-2.0
		default_applicable_licenses: ["frameworks_av_license"],
		}

		apex_defaults {
		name: "com.android.media-defaults",
		updatable: true,

+0 −11

Original line number	Diff line number	Diff line
		@@ -12,17 +12,6 @@
		// See the License for the specific language governing permissions and
		// limitations under the License.

		package {
		// See: http://go/android-license-faq
		// A large-scale-change added 'default_applicable_licenses' to import
		// all of the 'license_kinds' from "frameworks_av_license"
		// to get the below license kinds:
		// SPDX-license-identifier-Apache-2.0
		// SPDX-license-identifier-MIT
		// SPDX-license-identifier-Unicode-DFS
		default_applicable_licenses: ["frameworks_av_license"],
		}

		apex_test {
		name: "test_com.android.media",
		manifest: "test_manifest.json",

+1 −31

Original line number	Diff line number	Diff line
		@@ -12,37 +12,6 @@
		// See the License for the specific language governing permissions and
		// limitations under the License.

		package {
		default_applicable_licenses: ["frameworks_av_camera_license"],
		}

		// Added automatically by a large-scale-change that took the approach of
		// 'apply every license found to every target'. While this makes sure we respect
		// every license restriction, it may not be entirely correct.
		//
		// e.g. GPL in an MIT project might only apply to the contrib/ directory.
		//
		// Please consider splitting the single license below into multiple licenses,
		// taking care not to lose any license_kind information, and overriding the
		// default license using the 'licenses: [...]' property on targets as needed.
		//
		// For unused files, consider creating a 'fileGroup' with "//visibility:private"
		// to attach the license to, and including a comment whether the files may be
		// used in the current project.
		// See: http://go/android-license-faq
		license {
		name: "frameworks_av_camera_license",
		visibility: [":__subpackages__"],
		license_kinds: [
		"SPDX-license-identifier-Apache-2.0",
		"SPDX-license-identifier-MIT",
		"SPDX-license-identifier-Unicode-DFS",
		],
		license_text: [
		"NOTICE",
		],
		}

		cc_library_shared {
		name: "libcamera_client",

		@@ -81,6 +50,7 @@ cc_library_shared {
		],

		shared_libs: [
		"libbase",
		"libcutils",
		"libutils",
		"liblog",

+4 −4

Original line number	Diff line number	Diff line
		@@ -20,14 +20,16 @@
		#include <camera/CameraUtils.h>
		#include <media/hardware/HardwareAPI.h>

		#include <android-base/properties.h>
		#include <system/window.h>
		#include <system/graphics.h>

		#include <cutils/properties.h>
		#include <utils/Log.h>

		namespace android {

		const char *kCameraServiceDisabledProperty = "config.disable_cameraservice";

		status_t CameraUtils::getRotationTransform(const CameraMetadata& staticInfo,
		/out/int32_t* transform) {
		ALOGV("%s", __FUNCTION__);
		@@ -124,9 +126,7 @@ status_t CameraUtils::getRotationTransform(const CameraMetadata& staticInfo,
		}

		bool CameraUtils::isCameraServiceDisabled() {
		char value[PROPERTY_VALUE_MAX];
		property_get("config.disable_cameraservice", value, "0");
		return (strncmp(value, "0", 2) != 0 && strncasecmp(value, "false", 6) != 0);
		return base::GetBoolProperty(kCameraServiceDisabledProperty, false);
		}

		} /* namespace android */