diff options
| author | 2016-07-07 22:45:58 +0000 | |
|---|---|---|
| committer | 2016-07-07 22:45:58 +0000 | |
| commit | 32d9ae186733115802eafe241c2029a63794efc2 (patch) | |
| tree | 667eeb5699c2c2d79edb604edf2bbbd711453ae1 | |
| parent | fd949c63e440e3c55e78f344fdb9978a88561663 (diff) | |
| parent | 7d5389bd07be07c8bd7b7c024cc18042326fcc72 (diff) | |
Merge \\"Fix bug with launching home activity from LockSettingsService\\" into nyc-mr1-dev am: 49fd320574
am: 7d5389bd07
Change-Id: I93dd8dd06d447b6d5401b7af8fc18b6345ce03b1
| -rw-r--r-- | services/core/java/com/android/server/LockSettingsService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java index 85eee2bb27e2..8e0114a0815c 100644 --- a/services/core/java/com/android/server/LockSettingsService.java +++ b/services/core/java/com/android/server/LockSettingsService.java @@ -348,7 +348,7 @@ public class LockSettingsService extends ILockSettings.Stub { CharSequence detail = r.getText( com.android.internal.R.string.user_encrypted_detail); - PendingIntent intent = PendingIntent.getBroadcast(mContext, 0, ACTION_NULL, + PendingIntent intent = PendingIntent.getActivity(mContext, 0, ACTION_NULL, PendingIntent.FLAG_UPDATE_CURRENT); showEncryptionNotification(user, title, message, detail, intent); |