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

Commit 0ce1648f authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-e4ceb878ab564c70a4e1726ee7c0709a' into nyc-mr1-dev 

* changes:
  Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev am: a39d8886
  Merge "Replace caribou wallpaper without the stars b/28339724" into nyc-dev am: b3d4ad22
parents b5cb2ff0 e9baebb2

core/res/res/drawable-nodpi/default_wallpaper.png

+166 KiB (478 KiB)
Loading image diff...

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

+5 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.os.Parcel; 
import android.os.Process;

import android.os.RemoteException;

import android.os.storage.IMountService;

import android.os.storage.StorageManager;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.os.UserHandle;
@@ -355,6 +356,10 @@ public class LockSettingsService extends ILockSettings.Stub { 
    private void showEncryptionNotification(UserHandle user, CharSequence title, CharSequence message,

            CharSequence detail, PendingIntent intent) {

        if (DEBUG) Slog.v(TAG, "showing encryption notification, user: " + user.getIdentifier());



        // Suppress all notifications on non-FBE devices for now

        if (!StorageManager.isFileEncryptedNativeOrEmulated()) return;



        Notification notification = new Notification.Builder(mContext)

                .setSmallIcon(com.android.internal.R.drawable.ic_user_secure)

                .setWhen(0)