diff options
| author | 2016-07-07 22:32:09 +0000 | |
|---|---|---|
| committer | 2016-07-07 22:32:10 +0000 | |
| commit | 49fd32057410a1191eb9965745742c7e9ea68f3b (patch) | |
| tree | 0a51728363341c814cbdaa54200bb78d0a43e6d7 | |
| parent | 07e234c9d7ecc9f2b8b7b7d1caf79ea2a920c7ea (diff) | |
| parent | 016593fe848868808a4645ce2302c2ab07348c30 (diff) | |
Merge "Fix bug with launching home activity from LockSettingsService" into nyc-mr1-dev
| -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); |