diff options
| author | Jim Miller <jaggies@google.com> | 2013-03-14 02:34:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-14 02:34:43 +0000 |
| commit | aa2e84f29b57314f57cae09de94e49bc6cfa77ef (patch) | |
| tree | 17816dceb7d3fa0fb72ce65b4ef4cc1a28331d5f /packages/Keyguard/src/com/android/keyguard/EmergencyButton.java | |
| parent | bbaa7c129655795eb2f1d943d9e93c4236f4d5a7 (diff) | |
| parent | 3fe0205a00672ccc86f7ca3fc8980fc380891fce (diff) | |
| download | frameworks_base-aa2e84f29b57314f57cae09de94e49bc6cfa77ef.zip frameworks_base-aa2e84f29b57314f57cae09de94e49bc6cfa77ef.tar.gz frameworks_base-aa2e84f29b57314f57cae09de94e49bc6cfa77ef.tar.bz2 | |
am 3fe0205a: am 6d4dac74: Merge "Fix bug where Keyguard\'s emergencydialer wasn\'t being launched with a userid." into jb-mr2-dev
* commit '3fe0205a00672ccc86f7ca3fc8980fc380891fce':
Fix bug where Keyguard's emergencydialer wasn't being launched with a userid.
Diffstat (limited to 'packages/Keyguard/src/com/android/keyguard/EmergencyButton.java')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/EmergencyButton.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java b/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java index 3871cea..6badaaf 100644 --- a/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java +++ b/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.Intent; import android.os.PowerManager; import android.os.SystemClock; +import android.os.UserHandle; import android.telephony.TelephonyManager; import android.util.AttributeSet; import android.view.View; @@ -104,7 +105,8 @@ public class EmergencyButton extends Button { Intent intent = new Intent(ACTION_EMERGENCY_DIAL); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); - getContext().startActivity(intent); + getContext().startActivityAsUser(intent, + new UserHandle(mLockPatternUtils.getCurrentUser())); } } |