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

Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev am: a39d888651

Browse Source 
am: 3f9059fb8d

* commit '3f9059fb8d3b16a71107383719a5c6360ea79acc':
  Suppress unlock notifications on non-FBE devices.

Change-Id: I08aeb77aea7c20ff8debc8c653d3eeea31ca99a3
This commit is contained in:
Jeff Sharkey
2016-05-27 03:48:15 +00:00
committed by android-build-merger
parent dd119052b6 3f9059fb8d
commit 1ed6a87655
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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