Merge "docs: Updated Android SDK Terms. bug: 24584030" into mnc-docs (6c0860e3) · Commits · e / os / android_frameworks_base

docs/html/ndk/downloads/index.jd

+16 −10

Original line number	Diff line number	Diff line
		@@ -56,7 +56,12 @@ legally binding contract between you and Google in relation to your use of the S
		Open Source Project, which is located at the following URL: http://source.android.com/, as updated
		from time to time.

		1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600
		1.3 A "compatible implementation" means any Android device that (i) complies with the Android
		Compatibility Definition document, which can be found at the Android compatibility website
		(http://source.android.com/compatibility) and which may be updated from time to time; and (ii)
		successfully passes the Android Compatibility Test Suite (CTS).

		1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600
		Amphitheatre Parkway, Mountain View, CA 94043, United States.


		@@ -78,25 +83,26 @@ the License Agreement or use the SDK on behalf of your employer or other entity.

		<h3>3. SDK License from Google</h3>
		3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide,
		royalty-free, non-assignable and non-exclusive license to use the SDK solely to develop
		applications to run on the Android platform.
		royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to
		develop applications to run on the Android platform.

		3.2 You may not use this SDK to develop applications for other platforms (including non-compatible
		implementations of Android) or to develop another SDK. You are of course free to develop
		applications for other platforms, including non-compatible implementations of Android, provided
		that this SDK is not used for that purpose.

		3.2 You agree that Google or third parties own all legal right, title and interest in and to the
		3.3 You agree that Google or third parties own all legal right, title and interest in and to the
		SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property
		Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law,
		and any and all other proprietary rights. Google reserves all rights not expressly granted to you.

		3.3 You may not use the SDK for any purpose not expressly permitted by this License Agreement.
		3.4 You may not use the SDK for any purpose not expressly permitted by this License Agreement.
		Except to the extent required by applicable third party licenses, you may not: (a) copy (except for
		backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create
		derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile
		handset or any other hardware device except a personal computer, combine any part of the SDK with
		other software, or distribute any software or device incorporating a part of the SDK.

		3.4 You agree that you will not take any actions that may cause or result in the fragmentation of
		Android, including but not limited to distributing, participating in the creation of, or promoting
		in any way a software development kit derived from the SDK.

		3.5 Use, reproduction and distribution of components of the SDK licensed under an open source
		software license are governed solely by the terms of that open source software license and not this
		License Agreement.
		@@ -304,7 +310,7 @@ Agreement. Notwithstanding this, you agree that Google shall still be allowed to
		injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.


		<em>November 13, 2012</em>
		<em>November 20, 2015</em>
		</div>

docs/html/sdk/index.jd

+8 −6

Original line number	Diff line number	Diff line
		@@ -113,7 +113,9 @@ This is the Android Software Development Kit License Agreement

		1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.

		1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
		1.3 A "compatible implementation" means any Android device that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS).

		1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.


		<h3>2. Accepting this License Agreement</h3>
		@@ -127,13 +129,13 @@ This is the Android Software Development Kit License Agreement


		<h3>3. SDK License from Google</h3>
		3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the SDK solely to develop applications to run on the Android platform.
		3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for compatible implementations of Android.

		3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
		3.2 You may not use this SDK to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this SDK is not used for that purpose.

		3.3 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
		3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.

		3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK.
		3.4 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.

		3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.

		@@ -234,7 +236,7 @@ This is the Android Software Development Kit License Agreement
		14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.


		<em>December 8, 2014</em>
		<em>November 20, 2015</em>
		</div>

docs/html/sdk/terms.jd

+8 −6

Original line number	Diff line number	Diff line
		@@ -15,7 +15,9 @@ This is the Android Software Development Kit License Agreement

		1.2 “Android” means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.

		1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
		1.3 A "compatible implementation" means any Android device that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS).

		1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.


		<h3>2. Accepting this License Agreement</h3>
		@@ -29,13 +31,13 @@ This is the Android Software Development Kit License Agreement


		<h3>3. SDK License from Google</h3>
		3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the SDK solely to develop applications to run on the Android platform.
		3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications to run on the Android platform.

		3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
		3.2 You may not use this SDK to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this SDK is not used for that purpose.

		3.3 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
		3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.

		3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK.
		3.4 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.

		3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.

		@@ -136,7 +138,7 @@ This is the Android Software Development Kit License Agreement
		14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.


		<em>November 13, 2012</em>
		<em>November 20, 2015</em>
		</div>

		</div>
		No newline at end of file

docs/html/sdk/terms_body.html

+176 −159

Original line number	Diff line number	Diff line
		@@ -7,14 +7,24 @@
		1. Introduction
		</h2>
		<p>
		1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK"
		1.1 The Android Software Development Kit (referred to in the License Agreement as the "SDK"
		and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is
		licensed to you subject to the terms of this License Agreement. This License Agreement forms a
		licensed to you subject to the terms of the License Agreement. The License Agreement forms a
		legally binding contract between you and Google in relation to your use of the SDK.

		</p>
		<p>
		1.2 "Google" means Google Inc., a Delaware corporation with principal place of business at
		1.2 "Android" means the Android software stack for devices, as made available under the
		Android Open Source Project, which is located at the following URL: http://source.android.com/,
		as updated from time to time.
		</p>
		<p>
		1.3 A "compatible implementation" means any Android device that (i) complies with the
		Android Compatibility Definition document, which can be found at the Android compatibility
		website (http://source.android.com/compatibility) and which may be updated from time to time;
		and (ii) successfully passes the Android Compatibility Test Suite (CTS).
		</p>
		<p>
		1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at
		1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
		</p>
		<h2>
		@@ -51,42 +61,49 @@ accept the Licensing Agreement or use the SDK on behalf of your employer or othe
		</h2>
		<p>
		3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide,
		royalty-free, non- assignable and non-exclusive license to use the SDK solely to develop
		applications to run on the Android platform.
		royalty-free, non- assignable, non-exclusive, and non-sublicensable license to use the SDK solely
		to develop applications to run on the Android platform.
		</p>
		<p>
		3.2 You may not use this SDK to develop applications for other platforms (including
		non-compatible implementations of Android) or to develop another SDK. You are of course free
		to develop applications for other platforms, including non-compatible implementations of
		Android, provided that this SDK is not used for that purpose.
		</p>
		<p>
		3.2 You agree that Google or third parties own all legal right, title and interest in and to
		3.3 You agree that Google or third parties own all legal right, title and interest in and to
		the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property
		Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law,
		and any and all other proprietary rights. Google reserves all rights not expressly granted to you.

		</p>
		<p>
		3.3 Except to the extent required by applicable third party licenses, you may not copy
		(except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble,
		or create derivative works of the SDK or any part of the SDK. Except to the extent required by
		applicable third party licenses, you may not load any part of the SDK onto a mobile handset or any
		other hardware device except a personal computer, combine any part of the SDK with other software,
		or distribute any software or device incorporating a part of the SDK.
		3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement.
		Except to the extent required by applicable third party licenses, you may not: (a) copy (except
		for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or
		create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto
		a mobile handset or any other hardware device except a personal computer, combine any part of
		the SDK with other software, or distribute any software or device incorporating a part of the
		SDK.
		</p>
		<p>
		3.4 Use, reproduction and distribution of components of the SDK licensed under an open
		3.5 Use, reproduction and distribution of components of the SDK licensed under an open
		source software license are governed solely by the terms of that open source software license and
		not this License Agreement.
		</p>
		<p>
		3.5 You agree that the form and nature of the SDK that Google provides may change without
		3.6 You agree that the form and nature of the SDK that Google provides may change without
		prior notice to you and that future versions of the SDK may be incompatible with applications
		developed on previous versions of the SDK. You agree that Google may stop (permanently or
		temporarily) providing the SDK (or any features within the SDK) to you or to users generally at
		Google's sole discretion, without prior notice to you.
		</p>
		<p>
		3.6 Nothing in this License Agreement gives you a right to use any of Google's trade names,
		3.7 Nothing in this License Agreement gives you a right to use any of Google's trade names,
		trademarks, service marks, logos, domain names, or other distinctive brand features.
		</p>
		<p>
		3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices
		3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices
		(including copyright and trademark notices) that may be affixed to or contained within the SDK.
		</p>
		<h2>
		@@ -333,5 +350,5 @@ Agreement. Notwithstanding this, you agree that Google shall still be allowed to
		injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
		</p>
		<p>
		<em>April 10, 2009</em>
		<em>November 20, 2015</em>
		</p>
		No newline at end of file

docs/html/sdk/win-usb.jd

+8 −6

Original line number	Diff line number	Diff line
		@@ -23,7 +23,9 @@ This is the Android Software Development Kit License Agreement

		1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.

		1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
		1.3 A "compatible implementation" means any Android device that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS).

		1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.


		<h3>2. Accepting this License Agreement</h3>
		@@ -37,13 +39,13 @@ This is the Android Software Development Kit License Agreement


		<h3>3. SDK License from Google</h3>
		3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the SDK solely to develop applications to run on the Android platform.
		3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive and non-sublicensable license to use the SDK solely to develop applications to run on the Android platform.

		3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
		3.2 You may not use this SDK to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this SDK is not used for that purpose.

		3.3 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
		3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.

		3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK.
		3.4 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.

		3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.

		@@ -144,7 +146,7 @@ This is the Android Software Development Kit License Agreement
		14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.


		<em>November 13, 2012</em>
		<em>November 20, 2015</em>
		</div><!-- thin wrapper around tos doc -->