summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2009-05-31 19:44:35 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-05-31 19:44:35 -0700
commitad6042aa2342d0a869f84772774b47ae87346ccf (patch)
treef227b82e09bffaf9e4f401352c331d010f45752a /tests
parentc29c7158c79c04671e6cab379ef371ac20045454 (diff)
parent181fafaf48208978b8ba2022683ffa78aaeddde1 (diff)
downloadframeworks_base-ad6042aa2342d0a869f84772774b47ae87346ccf.zip
frameworks_base-ad6042aa2342d0a869f84772774b47ae87346ccf.tar.gz
frameworks_base-ad6042aa2342d0a869f84772774b47ae87346ccf.tar.bz2
am 181fafaf: Retool the backup process to use a new \'BackupAgent\' class
Merge commit '181fafaf48208978b8ba2022683ffa78aaeddde1' * commit '181fafaf48208978b8ba2022683ffa78aaeddde1': Retool the backup process to use a new 'BackupAgent' class
Diffstat (limited to 'tests')
-rw-r--r--tests/backup/AndroidManifest.xml7
-rw-r--r--tests/backup/src/com/android/backuptest/BackupTestAgent.java (renamed from tests/backup/src/com/android/backuptest/BackupTestService.java)6
2 files changed, 4 insertions, 9 deletions
diff --git a/tests/backup/AndroidManifest.xml b/tests/backup/AndroidManifest.xml
index eaeb5b7..3778742 100644
--- a/tests/backup/AndroidManifest.xml
+++ b/tests/backup/AndroidManifest.xml
@@ -1,6 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.backuptest">
- <application>
+ <application android:backupAgent="BackupTestAgent">
<activity android:name="BackupTestActivity" android:label="_BackupTest">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -8,10 +8,5 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <service android:name="BackupTestService">
- <intent-filter>
- <action android:name="android.backup.BackupService.SERVICE" />
- </intent-filter>
- </service>
</application>
</manifest>
diff --git a/tests/backup/src/com/android/backuptest/BackupTestService.java b/tests/backup/src/com/android/backuptest/BackupTestAgent.java
index 00eb86e..11e520e 100644
--- a/tests/backup/src/com/android/backuptest/BackupTestService.java
+++ b/tests/backup/src/com/android/backuptest/BackupTestAgent.java
@@ -16,15 +16,15 @@
package com.android.backuptest;
-import android.backup.BackupService;
+import android.app.BackupAgent;
import android.backup.BackupDataOutput;
import android.backup.FileBackupHelper;
import android.os.ParcelFileDescriptor;
import android.util.Log;
-public class BackupTestService extends BackupService
+public class BackupTestAgent extends BackupAgent
{
- static final String TAG = "BackupTestService";
+ static final String TAG = "BackupTestAgent";
@Override
public void onBackup(ParcelFileDescriptor oldState, BackupDataOutput data,