diff options
| author | Selim Cinek <cinek@google.com> | 2016-11-03 14:55:40 -0700 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2016-11-14 17:46:10 -0800 |
| commit | aca11d8bea9c9c00482f72957b5e025dd91243dd (patch) | |
| tree | 21d3a09258706e2399a7111cf5270e056a34cf91 | |
| parent | b5375056fea6c40a2469f48e2497948fb5927b9b (diff) | |
| download | base-aca11d8bea9c9c00482f72957b5e025dd91243dd.tar.gz | |
Fixed a bug with the emergency affordance in multi userandroid-7.1.1_r3
The emergency call was not launched in the current user
and therefore was only launching once the user had switched.
Change-Id: If6f3bcf77d88a0658b6e0f91f7e4da5d6264b04f
Fixes: 32424103
Test: manual: switch to secondary user and launch emergency affordance
(cherry picked from commit b8a7f78d242cafb0c3ec10868c28583e8aacdf7a)
| -rw-r--r-- | core/java/com/android/internal/policy/EmergencyAffordanceManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/com/android/internal/policy/EmergencyAffordanceManager.java b/core/java/com/android/internal/policy/EmergencyAffordanceManager.java index bed7c1ba4ed3..eb75bd497434 100644 --- a/core/java/com/android/internal/policy/EmergencyAffordanceManager.java +++ b/core/java/com/android/internal/policy/EmergencyAffordanceManager.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Build; +import android.os.UserHandle; import android.provider.Settings; /** @@ -72,7 +73,7 @@ public class EmergencyAffordanceManager { Intent intent = new Intent(Intent.ACTION_CALL_EMERGENCY); intent.setData(getPhoneUri(context)); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); + context.startActivityAsUser(intent, UserHandle.CURRENT); } /** |