Merge changes from topic 'marlin_merge_AU160' into nyc-mr1-dev

* changes: marlin: enable preopt dexing and update system partition size Copy MBN configuration if modem does not have version info marlin: Update to AU160 proprietary drop
LineageOS · May 11, 2016 · 35800f7 · 35800f7
2 parents 5142cea + af7d02c
commit 35800f7
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 264 deletions.
diff --git a/init.radio.sh b/init.radio.sh
@@ -19,7 +19,7 @@ else
 fi
 
 cur_version_info=`cat /firmware/radio/modem_pr/verinfo/ver_info.txt`
-if [ "$prev_version_info" != "$cur_version_info" ]; then
+if [ ! -f /firmware/verinfo/ver_info.txt -o "$prev_version_info" != "$cur_version_info" ]; then
     rm -rf /data/misc/radio/modem_config
     mkdir /data/misc/radio/modem_config
     chmod 770 /data/misc/radio/modem_config

diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk
@@ -81,7 +81,7 @@ OVERRIDE_RS_DRIVER:= libRSDriver_adreno.so
 
 TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_BOOTIMAGE_PARTITION_SIZE := 0x04000000
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2457600000
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472
 #BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := squashfs
 #BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0
 #BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR := lz4
@@ -139,19 +139,16 @@ TARGET_PD_SERVICE_ENABLED := true
 BOARD_QTI_CAMERA_32BIT_ONLY := true
 TARGET_BOOTIMG_SIGNED := true
 
-WITH_DEXPREOPT_BOOT_IMG_ONLY := true
-WITH_DEXPREOPT := false
-WITH_DEXPREOPT_PIC := false
-## Enable dex pre-opt to speed up initial boot
+# Enable dex pre-opt to speed up initial boot
 ifeq ($(HOST_OS),linux)
-   ifeq ($(WITH_DEXPREOPT),)
-     WITH_DEXPREOPT := true
-     WITH_DEXPREOPT_PIC := true
-     ifneq ($(TARGET_BUILD_VARIANT),user)
-       # Retain classes.dex in APK's for non-user builds
-       DEX_PREOPT_DEFAULT := nostripping
-     endif
-   endif
+  ifeq ($(WITH_DEXPREOPT),)
+    WITH_DEXPREOPT := true
+    WITH_DEXPREOPT_PIC := true
+    ifneq ($(TARGET_BUILD_VARIANT),user)
+      # Retain classes.dex in APK's for non-user builds
+      DEX_PREOPT_DEFAULT := nostripping
+    endif
+  endif
 endif
 
 # HTC_SENSOR_HUB

diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk
@@ -138,14 +138,14 @@ TARGET_BOOTIMG_SIGNED := true
 
 # Enable dex pre-opt to speed up initial boot
 ifeq ($(HOST_OS),linux)
-    ifeq ($(WITH_DEXPREOPT),)
-      WITH_DEXPREOPT := true
-      WITH_DEXPREOPT_PIC := true
-      ifneq ($(TARGET_BUILD_VARIANT),user)
-        # Retain classes.dex in APK's for non-user builds
-        DEX_PREOPT_DEFAULT := nostripping
-      endif
+  ifeq ($(WITH_DEXPREOPT),)
+    WITH_DEXPREOPT := true
+    WITH_DEXPREOPT_PIC := true
+    ifneq ($(TARGET_BUILD_VARIANT),user)
+      # Retain classes.dex in APK's for non-user builds
+      DEX_PREOPT_DEFAULT := nostripping
     endif
+  endif
 endif
 
 # HTC_SENSOR_HUB

diff --git a/telephony/ims/src/org/codeaurora/ims/QtiImsExtListenerBaseImpl.java b/telephony/ims/src/org/codeaurora/ims/QtiImsExtListenerBaseImpl.java
@@ -29,7 +29,6 @@
 package org.codeaurora.ims;
 
 import org.codeaurora.ims.internal.IQtiImsExtListener;
-import org.codeaurora.ims.QtiViceInfo;
 import android.telephony.Rlog;
 
 /**
@@ -62,10 +61,6 @@ public void onGetPacketErrorCount(int status, long packetErrorCount) {
     public void receiveCallDeflectResponse(int result) {
     }
 
-    @Override
-    public void notifyRefreshViceInfo(QtiViceInfo viceInfo) {
-    }
-
     @Override
     public void receiveCallTransferResponse(int result) {
     }

diff --git a/telephony/ims/src/org/codeaurora/ims/QtiViceInfo.aidl b/telephony/ims/src/org/codeaurora/ims/QtiViceInfo.aidl
diff --git a/telephony/ims/src/org/codeaurora/ims/QtiViceInfo.java b/telephony/ims/src/org/codeaurora/ims/QtiViceInfo.java
diff --git a/telephony/ims/src/org/codeaurora/ims/internal/IQtiImsExt.aidl b/telephony/ims/src/org/codeaurora/ims/internal/IQtiImsExt.aidl
@@ -108,15 +108,6 @@ oneway interface IQtiImsExt {
     void sendCallDeflectRequest(int phoneId, String deflectNumber,
             IQtiImsExtListener listener);
 
-   /**
-     * Register for VICE dialog
-     *
-     * @param listener, provided if caller needs to be notified for get result.
-     * @return void
-     *
-     */
-    void registerForViceRefreshInfo(IQtiImsExtListener listener);
-
    /**
      * sendCallTransferRequest
      * Transfer an established call to given number or call id

diff --git a/telephony/ims/src/org/codeaurora/ims/internal/IQtiImsExtListener.aidl b/telephony/ims/src/org/codeaurora/ims/internal/IQtiImsExtListener.aidl
@@ -28,8 +28,6 @@
 
 package org.codeaurora.ims.internal;
 
-import org.codeaurora.ims.QtiViceInfo;
-
 /**
  * Used by client application to get the result from lower layer by
  * communicating with vendor.
@@ -98,15 +96,6 @@ oneway interface IQtiImsExtListener {
      */
     void receiveCallDeflectResponse(int result);
 
-    /**
-     * Notifies client when Vice Dialog update is received
-     *
-     * @param <QtiViceInfo> - VICE Dialog
-     *
-     * @return void.
-     */
-    void notifyRefreshViceInfo(in QtiViceInfo viceInfo);
-
     /**
      * Notifies client the result of call transfer request
      *