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

Merge \"Fix bug with launching home activity from LockSettingsService\" into nyc-mr1-dev

Browse Source 
am: 49fd320574

Change-Id: Id050bad455a77ecc6523e8f0d5363668677f6945
This commit is contained in:
Jim Miller
2016-07-07 22:38:27 +00:00
committed by android-build-merger
parent 639a862315 49fd320574
commit 7d5389bd07
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/LockSettingsService.java
View File

@@ -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);