Don't go into full suspension when proximity is triggered

Change-Id: I2a91722b61050698b6684da0a06d959c046416da
Merge branch 'cm' into HEAD
camera: Restart preview after ZSL changes only if the preview is running

Don't touch the preview state if it was stopped to begin with

Change-Id: Ie81c01165778f98f92f11badc17c2023ea4610b7
Merge branch 'cm' into HEAD
camera: Restart preview after ZSL changes only if the preview is running

Don't touch the preview state if it was stopped to begin with

Change-Id: Ie81c01165778f98f92f11badc17c2023ea4610b7
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	camera/CameraWrapper.cpp

Change-Id: I5c0bb97fb9d27b0a3e41a0a09a7d3aefffa2df3c
init: Start rmt_storage in charger mode

This is required to prevent mdm watchdog bites

Change-Id: I0479bf550075d2158cc37f02f897732de693f47e
Make wpa_supplicant oneshot.

Should fix tethering.

framework/base 0685af39ebaa5f1666007f86b5941037363116b6 broke it initially.

Change-Id: Ida0c54459debe412114bc2ce3d45833f7607866b
Add coordinates for smartwindow cover

Change-Id: I6a86c32a5fa8c2a780ebd57218f0084db4bc40f2
g2: set volume last to avoid pops on speaker

this fixes the occasional pops on my d802...

Change-Id: I275c7e4ac02d1f388978c543a281f066c42a9e68
my changes