merge in nyc-mr1-release history after reset to nyc-mr1-dev
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index f70dc63..2b78891 100755
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -291,6 +291,12 @@
and the screen off animation has been performed. -->
<bool name="config_dozeAfterScreenOff">true</bool>
+ <!-- Doze: should the TYPE_PICK_UP_GESTURE sensor be used as a pulse signal. -->
+ <bool name="config_dozePulsePickup">true</bool>
+
+ <!-- Type of the double tap sensor. Empty if double tap is not supported. -->
+ <string name="config_dozeDoubleTapSensorType" translatable="false">com.google.sensor.double_touch</string>
+
<!-- Specifies whether to decouple the interactive state of the device from the display on/off state. -->
<bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 4ccd521..e6f154f 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -34,15 +34,9 @@
<!-- Doze: does this device support STATE_DOZE and STATE_DOZE_SUSPEND? -->
<bool name="doze_display_state_supported">true</bool>
- <!-- Doze: should the pickup sensor be used as a pulse signal? -->
- <bool name="doze_pulse_on_pick_up">true</bool>
-
<!-- Doze: can we assume the pickup sensor includes a proximity check? -->
<bool name="doze_pickup_performs_proximity_check">true</bool>
- <!-- Type of the double tap sensor. Empty if double tap is not supported. -->
- <string name="doze_double_tap_sensor_type" translatable="false">com.google.sensor.double_touch</string>
-
<!-- The default tiles to display in QuickSettings -->
<string name="quick_settings_tiles_default" translatable="false">
wifi,cell,battery,dnd,flashlight,rotation,bt,airplane,custom(com.google.android.gms/.nearby.discovery.ui.DiscoveryTileService)
diff --git a/sepolicy/verizon/seapp_contexts b/sepolicy/verizon/seapp_contexts
index c4c7694..951fef3 100644
--- a/sepolicy/verizon/seapp_contexts
+++ b/sepolicy/verizon/seapp_contexts
@@ -1,2 +1,3 @@
# Verizon for OBDM tool
-user=_app seinfo=verizon name=com.wits.monitor domain=obdm_app type=app_data_file levelFrom=all
+user=_app seinfo=verizon name=com.verizon.obdm domain=obdm_app type=app_data_file levelFrom=all
+user=_app seinfo=verizon name=com.verizon.obdm:background domain=obdm_app type=app_data_file levelFrom=all
diff --git a/sepolicy/verizon/verizon.x509.pem b/sepolicy/verizon/verizon.x509.pem
index fd4e6fd..a06efc2 100644
--- a/sepolicy/verizon/verizon.x509.pem
+++ b/sepolicy/verizon/verizon.x509.pem
@@ -1,19 +1,21 @@
-----BEGIN CERTIFICATE-----
-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
+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
+Hc+p+viW7lz17QqvZmOxjb6atkRpOVY=
-----END CERTIFICATE-----
