summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Selim Cinek <cinek@google.com> 2016-11-03 14:55:40 -0700
committer Selim Cinek <cinek@google.com> 2016-11-03 14:58:01 -0700
commit0294f9e39b3d226dd1f5fc8bedb4692bbc9ef188 (patch)
tree3f25eca865a4710c6aa7e1e62a8afa81f07bf4ef
parent0d75ccf0068b64c730c45bf0a53d1849f9fbe010 (diff)
Fixed a bug with the emergency affordance in multi user
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
-rw-r--r--core/java/com/android/internal/policy/EmergencyAffordanceManager.java3
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);
}
/**