am d26681c0: am 497e38db: Merge "metricsd: Relicense as Apache 2." (83399202) · Commits · e / os / android_system_core

metricsd/MODULE_LICENSE_BSD

deleted100644 → 0

+0 −0

Empty file deleted.

metricsd/NOTICE

deleted100644 → 0

+0 −27

Original line number	Diff line number	Diff line
		// Copyright 2014 The Chromium OS Authors. All rights reserved.
		//
		// Redistribution and use in source and binary forms, with or without
		// modification, are permitted provided that the following conditions are
		// met:
		//
		// * Redistributions of source code must retain the above copyright
		// notice, this list of conditions and the following disclaimer.
		// * Redistributions in binary form must reproduce the above
		// copyright notice, this list of conditions and the following disclaimer
		// in the documentation and/or other materials provided with the
		// distribution.
		// * Neither the name of Google Inc. nor the names of its
		// contributors may be used to endorse or promote products derived from
		// this software without specific prior written permission.
		//
		// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

metricsd/README

+15 −3

Original line number	Diff line number	Diff line
		Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
		Use of this source code is governed by a BSD-style license that can be
		found in the LICENSE file.
		Copyright (C) 2015 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.

		================================================================================

		The Chrome OS "metrics" package contains utilities for client-side user metric
		collection.

metricsd/c_metrics_library.cc

+15 −3

Original line number	Diff line number	Diff line
		// Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
		// Use of this source code is governed by a BSD-style license that can be
		// found in the LICENSE file.
		/*
		* Copyright (C) 2015 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.
		*/

		//
		// C wrapper to libmetrics

metricsd/include/metrics/c_metrics_library.h

+15 −3

Original line number	Diff line number	Diff line
		// Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
		// Use of this source code is governed by a BSD-style license that can be
		// found in the LICENSE file.
		/*
		* Copyright (C) 2015 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.
		*/

		#ifndef METRICS_C_METRICS_LIBRARY_H_
		#define METRICS_C_METRICS_LIBRARY_H_