Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5b0a076 authored by Nino Jagar's avatar Nino Jagar Committed by Automerger Merge Worker
Browse files

Merge "Send session resumed/paused to content protection" into udc-qpr-dev am:... 

Merge "Send session resumed/paused to content protection" into udc-qpr-dev am: 43448670 am: b375916f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23864564



Change-Id: I3d7c948d7f0591148c2024a7fa7ded93b1a4cce0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c791b64 b375916f

core/java/android/service/contentcapture/ContentCaptureService.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

 */

package android.service.contentcapture;

package android.service.contentcapture;





import static android.view.contentcapture.ContentCaptureEvent.TYPE_SESSION_PAUSED;

import static android.view.contentcapture.ContentCaptureEvent.TYPE_SESSION_RESUMED;

import static android.view.contentcapture.ContentCaptureHelper.sDebug;

import static android.view.contentcapture.ContentCaptureHelper.sDebug;

import static android.view.contentcapture.ContentCaptureHelper.sVerbose;

import static android.view.contentcapture.ContentCaptureHelper.sVerbose;

import static android.view.contentcapture.ContentCaptureHelper.toList;

import static android.view.contentcapture.ContentCaptureHelper.toList;
@@ -569,7 +571,16 @@ public abstract class ContentCaptureService extends Service { 
        List<ContentCaptureEvent> events = parceledEvents.getList();

        List<ContentCaptureEvent> events = parceledEvents.getList();

        int sessionIdInt = events.isEmpty() ? NO_SESSION_ID : events.get(0).getSessionId();

        int sessionIdInt = events.isEmpty() ? NO_SESSION_ID : events.get(0).getSessionId();

        ContentCaptureSessionId sessionId = new ContentCaptureSessionId(sessionIdInt);

        ContentCaptureSessionId sessionId = new ContentCaptureSessionId(sessionIdInt);



        ContentCaptureEvent startEvent =

                new ContentCaptureEvent(sessionIdInt, TYPE_SESSION_RESUMED);

        startEvent.setSelectionIndex(0, events.size());

        onContentCaptureEvent(sessionId, startEvent);



        events.forEach(event -> onContentCaptureEvent(sessionId, event));

        events.forEach(event -> onContentCaptureEvent(sessionId, event));



        ContentCaptureEvent endEvent = new ContentCaptureEvent(sessionIdInt, TYPE_SESSION_PAUSED);

        onContentCaptureEvent(sessionId, endEvent);

    }

    }





    private void handleOnActivitySnapshot(int sessionId, @NonNull SnapshotData snapshotData) {

    private void handleOnActivitySnapshot(int sessionId, @NonNull SnapshotData snapshotData) {