Merge branch 'readonly-p4-master' (4f7edaed) · Commits · e / os / android_frameworks_base

docs/html/community/index.jd

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -77,7 +77,7 @@ phrasing your questions, read <a href="http://www.catb.org/%7Eesr/faqs/smart-que
	<li><b>Android security discuss</b> - A place for open discussion on secure development, emerging security concerns, and best practices for and by android developers. Please don't disclose vulnerabilities directly on this list, you'd be putting all Android users at risk.		<li><b>Android security discuss</b> - A place for open discussion on secure development, emerging security concerns, and best practices for and by android developers. Please don't disclose vulnerabilities directly on this list, you'd be putting all Android users at risk.
	<ul>		<ul>
	<li>Subscribe using Google Groups: <a href="http://groups.google.com/group/android-security-discuss">android-security-discuss</a></li>		<li>Subscribe using Google Groups: <a href="http://groups.google.com/group/android-security-discuss">android-security-discuss</a></li>
	<li>Subscribe via email: <a href="mailto:android-security-discuss@googlegroups.com">android-secuirty-discuss@googlegroups.com</a><a href="mailto:android-platform-subscribe@googlegroups.com">		<li>Subscribe via email: <a href="mailto:android-security-discuss@googlegroups.com">android-security-discuss@googlegroups.com</a><a href="mailto:android-platform-subscribe@googlegroups.com">
	</a></li>		</a></li>
	</ul>		</ul>
	</li>		</li>

docs/html/guide/appendix/faq/framework.jd

+8 −9

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,6 @@ parent.link=index.html
	added or removed?</a></li>		added or removed?</a></li>
	</ul>		</ul>

	<!-- ------------------------------------------------------------------ -->

	<a name="1" id="1"></a>		<a name="1" id="1"></a>

	@@ -32,7 +31,7 @@ default. If needed, you can declare an <code>android:process</code> attribute
	in your manifest file, to explicitly place a component (Activity/Service) in		in your manifest file, to explicitly place a component (Activity/Service) in
	another process.</p>		another process.</p>

	<!-- ------------------------------------------------------------------ -->

	<a name="2" id="2"></a>		<a name="2" id="2"></a>

	@@ -47,7 +46,7 @@ separate pool of transaction threads in each process to dispatch all
	incoming IPC calls. The developer should create separate threads for any		incoming IPC calls. The developer should create separate threads for any
	long-running code, to avoid blocking the main UI thread.</p>		long-running code, to avoid blocking the main UI thread.</p>

	<!-- ------------------------------------------------------------------ -->

	<a name="3" id="3"></a>		<a name="3" id="3"></a>

	@@ -128,7 +127,7 @@ the <a href="{@docRoot}guide/topics/data/data-storage.html">Data Storage</a>
	for further details on how to use these components.</p>		for further details on how to use these components.</p>


	<!-- ------------------------------------------------------------------ -->

	<a name="4" id="4"></a>		<a name="4" id="4"></a>

	@@ -140,7 +139,7 @@ or to bring the activity stack to the front if is already running in the
	background— is the to use the NEW_TASK_LAUNCH flag in the startActivity()		background— is the to use the NEW_TASK_LAUNCH flag in the startActivity()
	call.</p>		call.</p>

	<!-- ------------------------------------------------------------------ -->

	<a name="5" id="5"></a>		<a name="5" id="5"></a>

	@@ -156,7 +155,7 @@ messages.</p>
	<p>The sample code for remote service callbacks is given in <a		<p>The sample code for remote service callbacks is given in <a
	href="{@docRoot}guide/samples/ApiDemos/src/com/example/android/apis/app/RemoteService.html">ApiDemos/RemoteService</a></p>		href="{@docRoot}guide/samples/ApiDemos/src/com/example/android/apis/app/RemoteService.html">ApiDemos/RemoteService</a></p>

	<!-- ------------------------------------------------------------------ -->

	<a name="6" id="6"></a>		<a name="6" id="6"></a>

	@@ -166,7 +165,7 @@ href="{@docRoot}guide/samples/ApiDemos/src/com/example/android/apis/app/RemoteSe
	document.</p>		document.</p>


	<!-- ------------------------------------------------------------------ -->

	<a name="7" id="7"></a>		<a name="7" id="7"></a>

	@@ -194,5 +193,5 @@ removed.

	</p>		</p>

	<!-- ------------------------------------------------------------------ -->

docs/html/guide/appendix/faq/troubleshooting.jd

+2 −46

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,6 @@ parent.link=index.html
	<li><a href="#majorminor">When I go to preferences in Eclipse and select "Android", I get the following error message: Unsupported major.minor version 49.0.</a></li>		<li><a href="#majorminor">When I go to preferences in Eclipse and select "Android", I get the following error message: Unsupported major.minor version 49.0.</a></li>
	<li><a href="#apidemosreinstall">I can't install ApiDemos apps in my IDE because of a signing error</a></li>		<li><a href="#apidemosreinstall">I can't install ApiDemos apps in my IDE because of a signing error</a></li>
	<li><a href="#signingcalendar">I can't compile my app because the build tools generated an expired debug certificate</a></li>		<li><a href="#signingcalendar">I can't compile my app because the build tools generated an expired debug certificate</a></li>
	<li><a href="#addjunit">I can't run a JUnit test class in Eclipse/ADT</a></li>
	</ul>		</ul>

	<a name="installeclipsecomponents" id="installeclipsecomponents"></a><h2>ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui".</h2>		<a name="installeclipsecomponents" id="installeclipsecomponents"></a><h2>ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui".</h2>
	@@ -245,8 +244,8 @@ documentation.</p>

	<ol>		<ol>
	<li>First, delete the debug keystore/key already generated by the Android build tools. Specifically, delete the <code>debug.keystore</code> file. On Linux/Mac OSX, the file is stored in <code>~/.android</code>. On Windows XP, the file is stored in <code>		<li>First, delete the debug keystore/key already generated by the Android build tools. Specifically, delete the <code>debug.keystore</code> file. On Linux/Mac OSX, the file is stored in <code>~/.android</code>. On Windows XP, the file is stored in <code>
	C:\Documents and Settings\<user>\Local Settings\Application Data\Android</code>. On Windows Vista, the file is stored in <code>		C:\Documents and Settings\<user>\.android</code>. On Windows Vista, the file is stored in <code>
	C:\Users\<user>\AppData\Local\Android</code></li>		C:\Users\<user>\.android</code></li>
	<li>Next, you can either		<li>Next, you can either
	<ul>		<ul>
	<li>Temporarily change your development machine's locale (date and time) to one that uses a Gregorian calendar, for example, United States. Once the locale is changed, use the Android build tools to compile and install your app. The build tools will regenerate a new keystore and debug key with valid dates. Once the new debug key is generated, you can reset your development machine to the original locale. </li>		<li>Temporarily change your development machine's locale (date and time) to one that uses a Gregorian calendar, for example, United States. Once the locale is changed, use the Android build tools to compile and install your app. The build tools will regenerate a new keystore and debug key with valid dates. Once the new debug key is generated, you can reset your development machine to the original locale. </li>
	@@ -260,46 +259,3 @@ C:\Users\<user>\AppData\Local\Android</code></li>
	<p>For general information about signing Android applications, see		<p>For general information about signing Android applications, see
	<a href="{@docRoot}guide/publishing/app-signing.html">Signing Your Applications</a>. </p>		<a href="{@docRoot}guide/publishing/app-signing.html">Signing Your Applications</a>. </p>

	<h2 id="addjunit">I can't run a JUnit test class in Eclipse/ADT</h2>

	<p>If you are developing on Eclipse/ADT, you can add JUnit test classes to your application. However, you may get an error when trying to run such a class as a JUnit test:</p>

	<pre>Error occurred during initialization of VM
	java/lang/NoClassDefFoundError: java/lang/ref/FinalReference</pre>

	<p>This error occurs because android.jar does not include complete Junit.* class implementations, but includes stub classes only. </p>

	<p>To add a JUnit class, you have to set up a JUnit configuration:.

	<ol>
	<li>In the Package Explorer view, select your project. </li>
	<li>Open the launch configuration manager.
	<ul>
	<li>In Eclipse 3.3 (Europa), select <strong>Run </strong>>
	<strong>Open Run Dialog... </strong>or <strong>Run </strong>>
	<strong>Open Debug Dialog... </strong>.
	</li>

	<li>In Eclipse 3.4 (Ganymede), select <strong>Run </strong>>
	<strong>Run Configurations... </strong>or <strong>Run </strong>>
	<strong>Debug Configurations... </strong>.
	</li>
	</ul>
	</li>
	<li>In the configuration manager, right-click the "JUnit" configuration type and select <strong>New</strong></li>
	<li>In the new configuration's <strong>Test</strong> tab, specify the project and test class, as well as any options for running the test. </li>
	<li>In the new configuration's <strong>Classpath</strong> tab, find "Android Library" under Bootstrap Entries and remove it. </li>
	<li>Still in the <strong>Classpath</strong> tab, select Bootstrap Entries and click the Advanced button. </li>
	<ol type="a">
	<li>Choose Add Library and click OK.</li>
	<li>Select JRE System Library and click Next. </li>
	<li>Select Workspace Default JRE and click Finish.</li>
	</ol>
	<li>Select Bootstrap Entries again and click Advanced.</li>
	<ol type="a">
	<li>Choose Add Library and click OK.</li>
	<li>Select JUnit 3 and click Finish. </li>
	</ol>
	</ol>
	<p>When configured in this way, your JUnit test class should now run properly.</p>

docs/html/guide/developing/app-signing.jd

deleted100644 → 0

+0 −428

File deleted.

Preview size limit exceeded, changes collapsed.

docs/html/guide/developing/tools/avd.jd

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -21,13 +21,12 @@ page.title=Android Virtual Devices
	<li><a href="#createavd">Creating the AVD</a></li>		<li><a href="#createavd">Creating the AVD</a></li>
	<li><a href="#hardwareopts">Setting hardware emulation options</a></li>		<li><a href="#hardwareopts">Setting hardware emulation options</a></li>
	<li><a href="#location">Default location of the AVD files</a></li>		<li><a href="#location">Default location of the AVD files</a></li>
	<li><a href="#createavdopts">Command-line options, create avd</a></li>
	</ol>		</ol>
	</li>		</li>
	<li><a href="#managing">Managing AVDs</a>		<li><a href="#managing">Managing AVDs</a>
	<ol>		<ol>
	<li><a href="#moving">Moving an AVD</a></li>		<li><a href="#moving">Moving an AVD</a></li>
	<li><a href="#updating">Deleting an AVD</a></li>		<li><a href="#updating">Updating an AVD</a></li>
	<li><a href="#deleting">Deleting an AVD</a></li>		<li><a href="#deleting">Deleting an AVD</a></li>
	</ol>		</ol>
	</li>		</li>
	@@ -35,7 +34,8 @@ page.title=Android Virtual Devices
	</ol>		</ol>
	<h2>See Also</h2>		<h2>See Also</h2>
	<ol>		<ol>
	<li>Android <a href="{@docRoot}guide/developing/tools/emulator.html">Emulator</a></li>		<li><a href="{@docRoot}guide/developing/tools/emulator.html">Android
			Emulator</a></li>
	</ol>		</ol>
	</div>		</div>
	</div>		</div>
	@@ -366,6 +366,10 @@ the <code>-p</code> option to place the AVD directory in another location.
	The AVD's .ini file remains in the .android directory on the network		The AVD's .ini file remains in the .android directory on the network
	drive, regardless of the location of the AVD directory. </p>		drive, regardless of the location of the AVD directory. </p>

			<h2 id="managing">Managing AVDs</h2>

			<p>The sections below provide more information about how to manage AVDs once you've created them. </p>

	<h3 id="moving">Moving an AVD</h3>		<h3 id="moving">Moving an AVD</h3>

	<p>If you want to move or rename an AVD, you can do so using this command:</p>		<p>If you want to move or rename an AVD, you can do so using this command:</p>
	@@ -455,7 +459,7 @@ files.</td>
	</tr>		</tr>
	<tr>		<tr>
	<td><code>-s <name></code> or <br>		<td><code>-s <name></code> or <br>
	<code>-s <dimensions></code> </td>		<code>-s <width>-<height></code> </td>
	<td>The skin to use for this AVD, identified by name or dimensions.</td>		<td>The skin to use for this AVD, identified by name or dimensions.</td>
	<td>The android tool scans for a matching skin by name or dimension in the		<td>The android tool scans for a matching skin by name or dimension in the
	<code>skins/</code> directory of the target referenced in the <code>-t		<code>skins/</code> directory of the target referenced in the <code>-t