diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-02-04 05:29:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-04 05:29:04 +0000 |
| commit | 5f87e0dfee8dfae306928986372283d4a117aaef (patch) | |
| tree | 1fbecf757440be7fb79633b8bd7e9a116925e942 /core/java/android | |
| parent | 2688fe61c42fe4750a0a06f2bf9366b9cb5a5399 (diff) | |
| parent | 60a494ae3858c1485c8d9b60264c0618128eeffe (diff) | |
Merge "Make the disconnecting list from activity up-to-date"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ActivityManagerInternal.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java index 4e47594b6196..c60f7bd29ce8 100644 --- a/core/java/android/app/ActivityManagerInternal.java +++ b/core/java/android/app/ActivityManagerInternal.java @@ -278,7 +278,7 @@ public abstract class ActivityManagerInternal { String resolvedType, boolean fgRequired, String callingPackage, @UserIdInt int userId, boolean allowBackgroundActivityStarts) throws TransactionTooLargeException; - public abstract void disconnectActivityFromServices(Object connectionHolder, Object conns); + public abstract void disconnectActivityFromServices(Object connectionHolder); public abstract void cleanUpServices(@UserIdInt int userId, ComponentName component, Intent baseIntent); public abstract ActivityInfo getActivityInfoForUser(ActivityInfo aInfo, @UserIdInt int userId); |