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

Commit 8fffa0ff authored by Tim Yu's avatar Tim Yu
Browse files

Autofill update latency_save_ui_display_millis 

Update with commit comments. The last commit merged in an older
patchset.

Test: com.android.server.autofill.SaveEventLoggerTest
Change-Id: I5c00974086a4ac67a7e881a94e89c482d24b07e4
parent f0b5c595

services/autofill/java/com/android/server/autofill/SaveEventLogger.java

+12 −14
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public class SaveEventLogger { 


  private final int mSessionId;

  private Optional<SaveEventInternal> mEventInternal;

  private long mSessionStartTimestamp;

  private final long mSessionStartTimestamp;



  private SaveEventLogger(int sessionId, long sessionStartTimestamp) {

      mSessionId = sessionId;
@@ -227,13 +227,11 @@ public class SaveEventLogger { 
    });

  }



  /* Returns timestamp (relative to mSessionStartTimestamp) or  UNINITIATED_TIMESTAMP if mSessionStartTimestamp is not set */

  private long getCurrentTimestamp() {

    long timestamp = UNINITIATED_TIMESTAMP;

    if (mSessionStartTimestamp != UNINITIATED_TIMESTAMP) {

      timestamp = SystemClock.elapsedRealtime() - mSessionStartTimestamp;

    }

    return timestamp;

  /**

   * Returns timestamp (relative to mSessionStartTimestamp)

   */

  private long getElapsedTime() {

    return SystemClock.elapsedRealtime() - mSessionStartTimestamp;

  }



  /**
@@ -247,7 +245,7 @@ public class SaveEventLogger { 


  /** Set latency_save_ui_display_millis as long as mEventInternal presents. */

  public void maybeSetLatencySaveUiDisplayMillis() {

    maybeSetLatencySaveUiDisplayMillis(getCurrentTimestamp());

    maybeSetLatencySaveUiDisplayMillis(getElapsedTime());

  }



  /**
@@ -261,7 +259,7 @@ public class SaveEventLogger { 


  /** Set latency_save_request_millis as long as mEventInternal presents. */

  public void maybeSetLatencySaveRequestMillis() {

    maybeSetLatencySaveRequestMillis(getCurrentTimestamp());

    maybeSetLatencySaveRequestMillis(getElapsedTime());

  }



  /**
@@ -275,7 +273,7 @@ public class SaveEventLogger { 


  /** Set latency_save_finish_millis as long as mEventInternal presents. */

  public void maybeSetLatencySaveFinishMillis() {

    maybeSetLatencySaveFinishMillis(getCurrentTimestamp());

    maybeSetLatencySaveFinishMillis(getElapsedTime());

  }



  /**
@@ -349,9 +347,9 @@ public class SaveEventLogger { 
    boolean mCancelButtonClicked = false;

    boolean mDialogDismissed = false;

    boolean mIsSaved = false;

    long mLatencySaveUiDisplayMillis = 0;

    long mLatencySaveRequestMillis = 0;

    long mLatencySaveFinishMillis = 0;

    long mLatencySaveUiDisplayMillis = UNINITIATED_TIMESTAMP;

    long mLatencySaveRequestMillis = UNINITIATED_TIMESTAMP;

    long mLatencySaveFinishMillis = UNINITIATED_TIMESTAMP;

    boolean mIsFrameworkCreatedSaveInfo = false;



    SaveEventInternal() {

services/autofill/java/com/android/server/autofill/Session.java

+3 −8
Original line number Diff line number Diff line
@@ -2446,9 +2446,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
            mSessionFlags.mShowingSaveUi = false;

            // Log onSaveRequest result.

            mSaveEventLogger.maybeSetIsSaved(true);

            final long saveRequestFinishTimestamp =

                SystemClock.elapsedRealtime() - mLatencyBaseTime;

            mSaveEventLogger.maybeSetLatencySaveFinishMillis(saveRequestFinishTimestamp);

            mSaveEventLogger.maybeSetLatencySaveFinishMillis();

            mSaveEventLogger.logAndEndEvent();

            if (mDestroyed) {

                Slog.w(TAG, "Call to Session#onSaveRequestSuccess() rejected - session: "
@@ -2479,9 +2477,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
        synchronized (mLock) {

            mSessionFlags.mShowingSaveUi = false;

            // Log onSaveRequest result.

            final long saveRequestFinishTimestamp =

                SystemClock.elapsedRealtime() - mLatencyBaseTime;

            mSaveEventLogger.maybeSetLatencySaveFinishMillis(saveRequestFinishTimestamp);

            mSaveEventLogger.maybeSetLatencySaveFinishMillis();

            mSaveEventLogger.logAndEndEvent();

            if (mDestroyed) {

                Slog.w(TAG, "Call to Session#onSaveRequestFailure() rejected - session: "
@@ -2627,8 +2623,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                return;

            }

        }

        final long saveRequestStartTimestamp = SystemClock.elapsedRealtime() - mLatencyBaseTime;

        mSaveEventLogger.maybeSetLatencySaveRequestMillis(saveRequestStartTimestamp);

        mSaveEventLogger.maybeSetLatencySaveRequestMillis();

        mHandler.sendMessage(obtainMessage(

                AutofillManagerServiceImpl::handleSessionSave,

                mService, this));

services/tests/servicestests/src/com/android/server/autofill/SaveEventLoggerTest.java

+0 −27
Original line number Diff line number Diff line
@@ -55,31 +55,4 @@ public class SaveEventLoggerTest { 
        assertThat(latencySaveFinishMillis.getValue())

                .isNotEqualTo(SaveEventLogger.UNINITIATED_TIMESTAMP);

    }



    @Test

    public void testTimestampsNotInitialized() {

        SaveEventLogger mLogger =

                spy(SaveEventLogger.forSessionId(1, SaveEventLogger.UNINITIATED_TIMESTAMP));



        mLogger.maybeSetLatencySaveUiDisplayMillis();

        mLogger.maybeSetLatencySaveRequestMillis();

        mLogger.maybeSetLatencySaveFinishMillis();

        ArgumentCaptor<Long> latencySaveUiDisplayMillis = ArgumentCaptor.forClass(Long.class);

        ArgumentCaptor<Long> latencySaveRequestMillis = ArgumentCaptor.forClass(Long.class);

        ArgumentCaptor<Long> latencySaveFinishMillis = ArgumentCaptor.forClass(Long.class);



        verify(mLogger, times(1))

                .maybeSetLatencySaveUiDisplayMillis(latencySaveUiDisplayMillis.capture());

        verify(mLogger, times(1))

                .maybeSetLatencySaveRequestMillis(latencySaveRequestMillis.capture());

        verify(mLogger, times(1))

                .maybeSetLatencySaveFinishMillis(latencySaveFinishMillis.capture());



        assertThat(latencySaveUiDisplayMillis.getValue())

                .isEqualTo(SaveEventLogger.UNINITIATED_TIMESTAMP);

        assertThat(latencySaveRequestMillis.getValue())

                .isEqualTo(SaveEventLogger.UNINITIATED_TIMESTAMP);

        assertThat(latencySaveFinishMillis.getValue())

                .isEqualTo(SaveEventLogger.UNINITIATED_TIMESTAMP);

    }

}