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

Commit 32d9ae18 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... 

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

Change-Id: I93dd8dd06d447b6d5401b7af8fc18b6345ce03b1
parents fd949c63 7d5389bd

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