diff options
author | 2016-07-07 22:38:27 +0000 | |
---|---|---|
committer | 2016-07-07 22:38:27 +0000 | |
commit | 7d5389bd07be07c8bd7b7c024cc18042326fcc72 (patch) | |
tree | adaf6263d06d9746bfd333d5d74dd64c0acd6e2b | |
parent | 639a862315b2992a13e474d5d5e31f46b6f2511e (diff) | |
parent | 49fd32057410a1191eb9965745742c7e9ea68f3b (diff) |
Merge \"Fix bug with launching home activity from LockSettingsService\" into nyc-mr1-dev
am: 49fd320574
Change-Id: Id050bad455a77ecc6523e8f0d5363668677f6945
-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); |