Merge branch 'froyo' into froyo-release (1b1f07b9) · Commits · e / os / android_frameworks_base

cmds/stagefright/stagefright.cpp

+6 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,12 @@ static void playSource(OMXClient *client, const sp<MediaSource> &source) {
		}
		}

		rawSource->start();
		status_t err = rawSource->start();

		if (err != OK) {
		fprintf(stderr, "rawSource returned error %d (0x%08x)\n", err, err);
		return;
		}

		if (gPlaybackAudio) {
		AudioPlayer *player = new AudioPlayer(NULL);

+5 −1

Original line number	Diff line number	Diff line
		@@ -301,7 +301,7 @@ public class ConnectivityManagerTestActivity extends Activity {
		if (sr.SSID.equals(knownSSID)) {
		Log.v(LOG_TAG, "found " + knownSSID + " in the scan result list");
		WifiConfiguration config = new WifiConfiguration();
		config.SSID = sr.SSID;
		config.SSID = convertToQuotedString(sr.SSID);
		config.allowedKeyManagement.set(KeyMgmt.NONE);
		int networkId = mWifiManager.addNetwork(config);
		// Connect to network by disabling others.
		@@ -387,6 +387,10 @@ public class ConnectivityManagerTestActivity extends Activity {
		context.sendBroadcast(intent);
		}

		protected static String convertToQuotedString(String string) {
		return "\"" + string + "\"";
		}

		@Override
		protected void onDestroy() {
		super.onDestroy();

+4 −3

Original line number	Diff line number	Diff line
		@@ -36,15 +36,16 @@ exchange, however, it also means that your apps will have to cope with that same
		variety of hardware.</p>

		<p>Fortunately, Android has built-in tools and support that make it easy for
		your apps to do that, while at the same time maintaining control of what types
		of devices your app is available to. If you do your work properly, users
		your apps to do that, while at the same time letting you maintain control of
		what types of devices your app is available to. With a bit of forethought and
		some minor changes in your app's manifest file, you can ensure that users
		whose devices can’t run your app will never see it in the Android Market, and
		will not get in trouble by downloading it. This page explains how you can
		control which devices have access to your apps, and how to prepare your apps to
		make sure they reach the right audience.</p>


		<h3 id="defined">What does “Compatibility” mean?</h3>
		<h3 id="defined">What does “compatibility” mean?</h3>

		<p>A device is “Android compatible” if it can correctly run apps written for the
		<em>Android execution environment</em>. The exact details of the Android execution

+3 −1

Original line number	Diff line number	Diff line
		@@ -171,7 +171,9 @@ device screen, and adapts them to the actual pixel map of the screen.</p>

		<p>The table below lists some of the more common screens supported
		by Android and illustrates how the platform maps them to generalized screen
		configurations.</p>
		configurations. Some devices use screens that are not specifically listed
		in the table — the platform maps those to the same set generalized
		screen configurations. </p>

		<p class="table-caption" id="screens-table"><strong>Table 1.</strong> Examples of
		device screens supported by Android.</p>

+20 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ page.title=Data Backup
		<li><a href="#RestoreVersion">Checking the Restore Data Version</a></li>
		<li><a href="#RequestingBackup">Requesting Backup</a></li>
		<li><a href="#RequestingRestore">Requesting Restore</a></li>
		<li><a href="#DevelopingTesting">Developing and Testing Your Backup Agent</a></li>
		</ol>

		<h2>Key classes</h2>
		@@ -759,3 +760,22 @@ implementation, passing the data from the current set of backup data.</p>
		restore operation with the <a href="{@docRoot}guide/developing/tools/bmgr.html">bmgr
		tool</a>.</p>


		<h2 id="DevelopingTesting">Developing and Testing Your Backup Agent</h2>

		<p>To develop and test your backup agent:</p>
		<ul>
		<li>Set your build target to a platform using API Level 8 or higher</li>
		<li>Run your application on a suitable Android system image:
		<ul>
		<li>If using the emulator, create and use an AVD with the Google APIs add-on (API Level
		8) — the Google APIs add-on is available as an SDK component through the SDK and AVD
		Manager</li>
		<li>If using a device, the device must be running Android 2.2 or greater and have Android
		Market built in</li>
		</ul>
		</li>
		<li>Test your backup agent using the <a href="{@docRoot}guide/developing/tools/bmgr.html">{@code
		bmgr}</a> tool to initiate backup and restore operations</li>
		</ul>