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

Commit 04ac2521 authored by Jiewen Lei's avatar Jiewen Lei Committed by Automerger Merge Worker
Browse files

Merge "Fix the error prone warmings from ag/22390888." into udc-dev am: 1c16bdc1 

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



Change-Id: I094a951c524405106e6c344859eb1a983fc41360
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f1d2e56b 1c16bdc1

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

+13 −16
Original line number Diff line number Diff line
@@ -2073,15 +2073,14 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
    @Override

    public void onSaveRequestSuccess(@NonNull String servicePackageName,

            @Nullable IntentSender intentSender) {

        synchronized (mLock) {

            mSessionFlags.mShowingSaveUi = false;

            // Log onSaveRequest result.

            mSaveEventLogger.maybeSetIsSaved(true);

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

            final long saveRequestFinishTimestamp =

                SystemClock.elapsedRealtime() - mLatencyBaseTime;

            mSaveEventLogger.maybeSetLatencySaveFinishMillis(saveRequestFinishTimestamp);

            mSaveEventLogger.logAndEndEvent();



        synchronized (mLock) {

            mSessionFlags.mShowingSaveUi = false;



            if (mDestroyed) {

                Slog.w(TAG, "Call to Session#onSaveRequestSuccess() rejected - session: "

                        + id + " destroyed");
@@ -2108,14 +2107,13 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
            @NonNull String servicePackageName) {

        boolean showMessage = !TextUtils.isEmpty(message);



        synchronized (mLock) {

            mSessionFlags.mShowingSaveUi = false;

            // Log onSaveRequest result.

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

            final long saveRequestFinishTimestamp =

                SystemClock.elapsedRealtime() - mLatencyBaseTime;

            mSaveEventLogger.maybeSetLatencySaveFinishMillis(saveRequestFinishTimestamp);

            mSaveEventLogger.logAndEndEvent();



        synchronized (mLock) {

            mSessionFlags.mShowingSaveUi = false;



            if (mDestroyed) {

                Slog.w(TAG, "Call to Session#onSaveRequestFailure() rejected - session: "

                        + id + " destroyed");
@@ -2228,8 +2226,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
    // AutoFillUiCallback

    @Override

    public void save() {

        mSaveEventLogger.maybeSetSaveButtonClicked(true);

        synchronized (mLock) {

            mSaveEventLogger.maybeSetSaveButtonClicked(true);

            if (mDestroyed) {

                Slog.w(TAG, "Call to Session#save() rejected - session: "

                        + id + " destroyed");
@@ -2247,10 +2245,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
    // AutoFillUiCallback

    @Override

    public void cancelSave() {

        mSaveEventLogger.maybeSetDialogDismissed(true);

        synchronized (mLock) {

            mSessionFlags.mShowingSaveUi = false;



            mSaveEventLogger.maybeSetDialogDismissed(true);

            if (mDestroyed) {

                Slog.w(TAG, "Call to Session#cancelSave() rejected - session: "

                        + id + " destroyed");