commit 32d9ae186733115802eafe241c2029a63794efc2
author Jim Miller <jaggies@google.com> Thu Jul 07 22:45:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 07 22:45:58 2016 +0000
tree 667eeb5699c2c2d79edb604edf2bbbd711453ae1
parent fd949c63e440e3c55e78f344fdb9978a88561663
parent 7d5389bd07be07c8bd7b7c024cc18042326fcc72

Merge \\"Fix bug with launching home activity from LockSettingsService\\" into nyc-mr1-dev am: 49fd320574
am: 7d5389bd07

Change-Id: I93dd8dd06d447b6d5401b7af8fc18b6345ce03b1

services/core/java/com/android/server/LockSettingsService.java

diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java
index 85eee2b..8e0114a 100644
--- a/services/core/java/com/android/server/LockSettingsService.java
+++ b/services/core/java/com/android/server/LockSettingsService.java
@@ -348,7 +348,7 @@
         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);