From 49aa55ea38f98e669140b71ea48fa36416ff337a Mon Sep 17 00:00:00 2001
From: Sunil Ravi <sunilravi@google.com>
Date: Thu, 8 Aug 2019 13:29:39 -0700
Subject: [PATCH 1/2] Wi-Fi: Enable Auto BMPS feature

Initial Powersave state in driver is out of sync with
cfg80211/framework powersave state because of which driver
doesn't go to powersave mode in case of static IP configuration.

This change triggers a timer (gAutoBmpsTimerValue=90) after the
association and put the chip into powersave mode after timeout.

Bug: 38254069
Bug: 138267246
Test: Regression test
Change-Id: I960a346ebcbd31b7c33d33bc11416e9f7325d6f2
---
 WCNSS_qcom_cfg.ini | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini
index 8a924a6..74add22 100644
--- a/WCNSS_qcom_cfg.ini
+++ b/WCNSS_qcom_cfg.ini
@@ -666,6 +666,10 @@ oce_enable_rssi_assoc_reject=0
 #Timer waiting for interface up from the upper layer
 gInterfaceChangeWait=1000
 
+#Enable Bmps(power save in connected state) based on timer
+#Timer value is in seconds
+gAutoBmpsTimerValue=90
+
 END
 
 # Note: Configuration parser would not read anything past the END marker

From 0fef6f3753c389f0778af4e22c3360a899e4c0a0 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 27 Aug 2019 11:32:50 -0700
Subject: [PATCH 2/2] Add ims.apk blob

BUG:138143812
Change-Id: Ic7148a511a99419ffb3161e3e4b2d785cbdf5f93
---
 self-extractors/extract-lists.txt              |  1 +
 self-extractors/qcom/staging/Android.mk        | 14 ++++++++++++++
 self-extractors/qcom/staging/device-partial.mk |  4 ++++
 3 files changed, 19 insertions(+)
 create mode 100644 self-extractors/qcom/staging/Android.mk

diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index 4ec19ed..a4bf07f 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -5,6 +5,7 @@
     ;;
   qcom)
     TO_EXTRACT="\
+            system/app/ims/ims.apk \
             system/etc/cne/Nexus/ATT/ATT_profiles.xml \
             system/etc/cne/Nexus/ROW/ROW_profiles.xml \
             system/etc/cne/Nexus/VZW/VZW_profiles.xml \
diff --git a/self-extractors/qcom/staging/Android.mk b/self-extractors/qcom/staging/Android.mk
new file mode 100644
index 0000000..3265531
--- /dev/null
+++ b/self-extractors/qcom/staging/Android.mk
@@ -0,0 +1,14 @@
+LOCAL_PATH := $(call my-dir)
+
+ifneq ($(filter taimen, $(TARGET_DEVICE)),)
+include $(CLEAR_VARS)
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_MODULE := ims
+LOCAL_MODULE_TAGS := optional
+LOCAL_BUILT_MODULE_STEM := package.apk
+LOCAL_MODULE_OWNER := qcom
+LOCAL_MODULE_CLASS := APPS
+LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
+LOCAL_CERTIFICATE := platform
+include $(BUILD_PREBUILT)
+endif
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index 48e5ec6..0d21a76 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -12,6 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# AOSP packages required by the blobs
+PRODUCT_PACKAGES := \
+    ims
+
 #  blob(s) necessary for Taimen hardware
 PRODUCT_COPY_FILES := \
     vendor/qcom/taimen/proprietary/ATT_profiles.xml:system/etc/cne/Nexus/ATT/ATT_profiles.xml:qcom \