summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/IActivityManager.java
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-08-02 11:09:55 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-08-02 11:37:43 -0700
commitcacdaa4aeedc6b0817eba92a83b8e5edfe27f637 (patch)
treef12313a55eeaa75f4faff3e1d134dc349420f094 /core/java/android/app/IActivityManager.java
parent1ab48a3666118e40cf56142c886a7217b92d0d4a (diff)
parent4e4743a354e26467318b437892a9980eb9b8328a (diff)
downloadframeworks_base-cacdaa4aeedc6b0817eba92a83b8e5edfe27f637.zip
frameworks_base-cacdaa4aeedc6b0817eba92a83b8e5edfe27f637.tar.gz
frameworks_base-cacdaa4aeedc6b0817eba92a83b8e5edfe27f637.tar.bz2
Merge tag 'android-6.0.1_r61' into HEAD
Android 6.0.1 Release 61 (MOB30Z) Change-Id: Ib003ccb606e0d77209291b757ea36399d3b65814
Diffstat (limited to 'core/java/android/app/IActivityManager.java')
-rw-r--r--core/java/android/app/IActivityManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java
index 6370268..7221e47 100644
--- a/core/java/android/app/IActivityManager.java
+++ b/core/java/android/app/IActivityManager.java
@@ -184,7 +184,7 @@ public interface IActivityManager extends IInterface {
public IBinder peekService(Intent service, String resolvedType, String callingPackage)
throws RemoteException;
- public boolean bindBackupAgent(ApplicationInfo appInfo, int backupRestoreMode)
+ public boolean bindBackupAgent(String packageName, int backupRestoreMode, int userId)
throws RemoteException;
public void clearPendingBackup() throws RemoteException;
public void backupAgentCreated(String packageName, IBinder agent) throws RemoteException;