Merge "Allow to keep screen on only if window can be seen" into nyc-mr1-dev am: 305d610fd8 am: 74670684d4

am: 541d028da4

Change-Id: I095b6af71821585064f51f3a992293b21fabc742
This commit is contained in:
Chong Zhang
2016-08-12 03:05:54 +00:00
committed by android-build-merger

View File

@@ -1050,6 +1050,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
builder.setTicker(title);
builder.setContentTitle(title);
builder.setContentText(body);
builder.setDefaults(Notification.DEFAULT_ALL);
builder.setPriority(Notification.PRIORITY_HIGH);
final Intent snoozeIntent = buildSnoozeWarningIntent(policy.template);
builder.setDeleteIntent(PendingIntent.getBroadcast(