diff options
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/service/contentcapture/ActivityEvent.java | 13 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 3 |
4 files changed, 15 insertions, 3 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 8a201a15035e..47e2b5bd5cfe 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -6429,6 +6429,7 @@ package android.service.contentcapture { method public int getEventType(); method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.service.contentcapture.ActivityEvent> CREATOR; + field public static final int TYPE_ACTIVITY_DESTROYED = 24; // 0x18 field public static final int TYPE_ACTIVITY_PAUSED = 2; // 0x2 field public static final int TYPE_ACTIVITY_RESUMED = 1; // 0x1 field public static final int TYPE_ACTIVITY_STOPPED = 23; // 0x17 diff --git a/api/test-current.txt b/api/test-current.txt index b86257c6008f..0fcf72702f1b 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -2394,6 +2394,7 @@ package android.service.contentcapture { method public int getEventType(); method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.service.contentcapture.ActivityEvent> CREATOR; + field public static final int TYPE_ACTIVITY_DESTROYED = 24; // 0x18 field public static final int TYPE_ACTIVITY_PAUSED = 2; // 0x2 field public static final int TYPE_ACTIVITY_RESUMED = 1; // 0x1 field public static final int TYPE_ACTIVITY_STOPPED = 23; // 0x17 diff --git a/core/java/android/service/contentcapture/ActivityEvent.java b/core/java/android/service/contentcapture/ActivityEvent.java index 5407c1d9b832..fc781c2035f6 100644 --- a/core/java/android/service/contentcapture/ActivityEvent.java +++ b/core/java/android/service/contentcapture/ActivityEvent.java @@ -52,11 +52,17 @@ public final class ActivityEvent implements Parcelable { */ public static final int TYPE_ACTIVITY_STOPPED = Event.ACTIVITY_STOPPED; + /** + * The activity was destroyed. + */ + public static final int TYPE_ACTIVITY_DESTROYED = Event.ACTIVITY_DESTROYED; + /** @hide */ @IntDef(prefix = { "TYPE_" }, value = { TYPE_ACTIVITY_RESUMED, TYPE_ACTIVITY_PAUSED, - TYPE_ACTIVITY_STOPPED + TYPE_ACTIVITY_STOPPED, + TYPE_ACTIVITY_DESTROYED }) @Retention(RetentionPolicy.SOURCE) public @interface ActivityEventType{} @@ -81,7 +87,8 @@ public final class ActivityEvent implements Parcelable { /** * Gets the event type. * - * @return either {@link #TYPE_ACTIVITY_RESUMED} or {@value #TYPE_ACTIVITY_PAUSED}. + * @return either {@link #TYPE_ACTIVITY_RESUMED}, {@value #TYPE_ACTIVITY_PAUSED}, + * {@value #TYPE_ACTIVITY_STOPPED}, or {@value #TYPE_ACTIVITY_DESTROYED}. */ @ActivityEventType public int getEventType() { @@ -97,6 +104,8 @@ public final class ActivityEvent implements Parcelable { return "ACTIVITY_PAUSED"; case TYPE_ACTIVITY_STOPPED: return "ACTIVITY_STOPPED"; + case TYPE_ACTIVITY_DESTROYED: + return "ACTIVITY_DESTROYED"; default: return "UKNOWN_TYPE: " + type; } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 92b7c3c92faf..97cc756e3924 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -2937,7 +2937,8 @@ public class ActivityManagerService extends IActivityManager.Stub } } if (mContentCaptureService != null && (event == Event.ACTIVITY_PAUSED - || event == Event.ACTIVITY_RESUMED || event == Event.ACTIVITY_STOPPED)) { + || event == Event.ACTIVITY_RESUMED || event == Event.ACTIVITY_STOPPED + || event == Event.ACTIVITY_DESTROYED)) { mContentCaptureService.notifyActivityEvent(userId, activity, event); } } |