Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug where Keyguard's emergencydialer wasn't being launched with a userid." into jb-mr2-dev

Browse Source
This commit is contained in:
Jim Miller
2013-03-14 00:00:15 +00:00
committed by Android (Google) Code Review
parent ad7a1d564d 450a3a1697
commit 6d4dac7423
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
policy/src/com/android/internal/policy/impl/keyguard/EmergencyButton.java
View File

@@ -20,6 +20,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.UserHandle;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
@@ -104,7 +105,8 @@ public class EmergencyButton extends Button {
Intent intent = new Intent(ACTION_EMERGENCY_DIAL); Intent intent = new Intent(ACTION_EMERGENCY_DIAL);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
getContext().startActivity(intent); getContext().startActivityAsUser(intent,
new UserHandle(mLockPatternUtils.getCurrentUser()));
} }
} }