Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d5389bd authored by Jim Miller's avatar Jim Miller Committed by android-build-merger
Browse files

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

am: 49fd3205

Change-Id: Id050bad455a77ecc6523e8f0d5363668677f6945
parents 639a8623 49fd3205

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

+1 −1
Original line number Diff line number Diff line
@@ -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);