diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-08 11:09:38 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-10-08 11:09:38 -0700 |
| commit | a1b0d6966e45e847aa47cc35eac8ea4e624d6a99 (patch) | |
| tree | 2da539e46b65faf49803cb919952f8a488089c99 /core/java/android/app/IActivityManager.java | |
| parent | 026284745bb2f84e96fe132071f48a8cd4c1e715 (diff) | |
| parent | efa4f7f87d5009d7f69c8429b29938be1cf21584 (diff) | |
resolved conflicts for merge of efa4f7f8 to master
Change-Id: I00dff76594326a6f6e69515a9cba673602ed269d
Diffstat (limited to 'core/java/android/app/IActivityManager.java')
| -rw-r--r-- | core/java/android/app/IActivityManager.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java index cd229e30f890..c9d5448767c5 100644 --- a/core/java/android/app/IActivityManager.java +++ b/core/java/android/app/IActivityManager.java @@ -116,7 +116,6 @@ public interface IActivityManager extends IInterface { public void unbroadcastIntent(IApplicationThread caller, Intent intent) throws RemoteException; /* oneway */ public void finishReceiver(IBinder who, int resultCode, String resultData, Bundle map, boolean abortBroadcast) throws RemoteException; - public void setPersistent(IBinder token, boolean isPersistent) throws RemoteException; public void attachApplication(IApplicationThread app) throws RemoteException; /* oneway */ public void activityIdle(IBinder token, Configuration config) throws RemoteException; @@ -455,7 +454,7 @@ public interface IActivityManager extends IInterface { int REPORT_THUMBNAIL_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+27; int GET_CONTENT_PROVIDER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+28; int PUBLISH_CONTENT_PROVIDERS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+29; - int SET_PERSISTENT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+30; + int FINISH_SUB_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+31; int GET_RUNNING_SERVICE_CONTROL_PANEL_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+32; int START_SERVICE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+33; |