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

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

Browse Source 
am: 0ce1648f01

* commit '0ce1648f016e96cd7a496753b86d16f78795930a':
  Suppress unlock notifications on non-FBE devices.
  Replace caribou wallpaper without the stars b/28339724

Change-Id: I05bc48ae343e57be43e88dafc538a3dfe77ff37a
This commit is contained in:
Jeff Sharkey
2016-05-27 03:23:40 +00:00
committed by android-build-merger
parent eacf998c56 0ce1648f01
commit 68f4e9fbb2
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/res/res/drawable-nodpi/default_wallpaper.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 312 KiB

After

Width:  |  Height:  |  Size: 478 KiB

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

@@ -50,6 +50,7 @@ import android.os.Parcel;
import android.os.Process; import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.storage.IMountService; import android.os.storage.IMountService;
import android.os.storage.StorageManager;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserHandle; import android.os.UserHandle;
@@ -355,6 +356,10 @@ public class LockSettingsService extends ILockSettings.Stub {
private void showEncryptionNotification(UserHandle user, CharSequence title, CharSequence message, private void showEncryptionNotification(UserHandle user, CharSequence title, CharSequence message,
CharSequence detail, PendingIntent intent) { CharSequence detail, PendingIntent intent) {
if (DEBUG) Slog.v(TAG, "showing encryption notification, user: " + user.getIdentifier()); 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) Notification notification = new Notification.Builder(mContext)
.setSmallIcon(com.android.internal.R.drawable.ic_user_secure) .setSmallIcon(com.android.internal.R.drawable.ic_user_secure)
.setWhen(0) .setWhen(0)