summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorDan Egnor <egnor@google.com>2010-06-03 14:10:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-03 14:10:42 -0700
commit4ff90676aebfce30ef04abb88dadf0b9407bfdad (patch)
tree68903a46ad1edb61a815644bcb82a9d68d50fcfa /samples
parentc2b27167ddcbc565a5dae7a80448111e377a0bd6 (diff)
parent7e7d75eefd23debadb67e894bc152e479bdb714f (diff)
downloadandroid_development-4ff90676aebfce30ef04abb88dadf0b9407bfdad.tar.gz
android_development-4ff90676aebfce30ef04abb88dadf0b9407bfdad.tar.bz2
android_development-4ff90676aebfce30ef04abb88dadf0b9407bfdad.zip
am 7e7d75ee: am 27626c03: Add API key to BackupRestore sample code.
Merge commit '7e7d75eefd23debadb67e894bc152e479bdb714f' into kraken * commit '7e7d75eefd23debadb67e894bc152e479bdb714f': Add API key to BackupRestore sample code.
Diffstat (limited to 'samples')
-rw-r--r--samples/BackupRestore/AndroidManifest.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/samples/BackupRestore/AndroidManifest.xml b/samples/BackupRestore/AndroidManifest.xml
index 8c3772026..af86634ce 100644
--- a/samples/BackupRestore/AndroidManifest.xml
+++ b/samples/BackupRestore/AndroidManifest.xml
@@ -30,7 +30,11 @@
<application android:label="Backup/Restore"
android:backupAgent="ExampleAgent">
- <activity android:name="BackupRestoreActivity">
+ <!-- Some backup transports may require API keys or other metadata -->
+ <meta-data android:name="com.google.android.backup.api_key"
+ android:value="INSERT YOUR API KEY HERE" />
+
+ <activity android:name="BackupRestoreActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />