From 16ed196ade4397c318fdc5728d7c60ad42f615e2 Mon Sep 17 00:00:00 2001 From: Nicholas Sauer Date: Sat, 20 Jun 2020 23:04:59 -0700 Subject: [PATCH] Create the PendingIntent for UserHandle.CURRENT This fixes use of the autofill SaveUi for secondary users. Without this change, when running under a secondary user, the PendingIntent is always sent to U0. Bug: 159618798 Bug: 155102708 Test: lunch hawk-userdebug && m run cts --skip-device-info -s emulator-5554 -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.SimpleSaveActivityTest#testTapUrlSpanOnSuccinctDescription_thenTapBack Change-Id: Ie6deaaaf47a11ae841c183003471d051df2beb90 --- .../autofill/java/com/android/server/autofill/ui/SaveUi.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java index 507e98369855e..1c3116699b2d8 100644 --- a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java +++ b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java @@ -33,6 +33,7 @@ import android.graphics.drawable.Drawable; import android.metrics.LogMaker; import android.os.Handler; import android.os.IBinder; +import android.os.UserHandle; import android.service.autofill.BatchUpdates; import android.service.autofill.CustomDescription; import android.service.autofill.InternalOnClickAction; @@ -196,7 +197,9 @@ final class SaveUi { } 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) { Slog.d(TAG, "startActivity add save UI restored with intent=" + intent); }