Merge "Create the PendingIntent for UserHandle.CURRENT" into rvc-dev am: e1ac825e3a am: 752bc75ec7

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

Change-Id: I77c009954b163c4fc052611f83ed079f6eff05b1
This commit is contained in:
Nicholas Sauer
2020-06-22 19:03:17 +00:00
committed by Automerger Merge Worker

View File

@@ -33,6 +33,7 @@ import android.graphics.drawable.Drawable;
import android.metrics.LogMaker; import android.metrics.LogMaker;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.os.UserHandle;
import android.service.autofill.BatchUpdates; import android.service.autofill.BatchUpdates;
import android.service.autofill.CustomDescription; import android.service.autofill.CustomDescription;
import android.service.autofill.InternalOnClickAction; import android.service.autofill.InternalOnClickAction;
@@ -196,7 +197,9 @@ final class SaveUi {
} }
intent.putExtra(AutofillManager.EXTRA_RESTORE_CROSS_ACTIVITY, true); intent.putExtra(AutofillManager.EXTRA_RESTORE_CROSS_ACTIVITY, true);
PendingIntent p = PendingIntent.getActivity(this, 0, intent, 0); PendingIntent p = PendingIntent.getActivityAsUser(
this, /* requestCode= */ 0, intent, /* flags= */ 0, /* options= */ null,
UserHandle.CURRENT);
if (sDebug) { if (sDebug) {
Slog.d(TAG, "startActivity add save UI restored with intent=" + intent); Slog.d(TAG, "startActivity add save UI restored with intent=" + intent);
} }