invisiblek

diff --git a/src/java/com/android/internal/telephony/uicc/RuimRecords.java b/src/java/com/android/internal/telephony/uicc/RuimRecords.java
index 1556c32..7c5aa4a 100644
--- a/src/java/com/android/internal/telephony/uicc/RuimRecords.java
+++ b/src/java/com/android/internal/telephony/uicc/RuimRecords.java
@@ -20,6 +20,7 @@ package com.android.internal.telephony.uicc;
 import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_ISO_COUNTRY;
 import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC;
 import static com.android.internal.telephony.TelephonyProperties.PROPERTY_APN_RUIM_OPERATOR_NUMERIC;
+import static com.android.internal.telephony.TelephonyProperties.PROPERTY_OPERATOR_NUMERIC;
 

invisiblek

<?xml version="1.0" encoding="utf-8"?>

<spnOverrides>
  <!-- Afghanistan -->
  <spnOverride numeric="41201"  spn="AWCC" />
  <spnOverride numeric="41240"  spn="Areeba" />
  <spnOverride numeric="41250"  spn="Etisalat" />
  <spnOverride numeric="41220"  spn="Roshan" />
  <!-- Albania -->
  <spnOverride numeric="27601"  spn="AMC" />

invisiblek

<?xml version="1.0" encoding="utf-8"?>

<spnOverrides>
  <!-- Korea -->
  <spnOverride numeric="45005" spn_display_rule="SPN_RULE_SHOW_PLMN" />
  <!-- Japan -->
  <spnOverride numeric="44010" spn_display_rule="SPN_RULE_SHOW_PLMN" />
  <spnOverride numeric="44020" spn="SoftBank" />
  <!-- Hong Kong -->
  <spnOverride numeric="45406" spn="SmarTone" />

invisiblek

diff --git a/configs/audio_platform_info.xml b/configs/audio_platform_info.xml
index 84d34db..8450a54 100644
--- a/configs/audio_platform_info.xml
+++ b/configs/audio_platform_info.xml
@@ -27,10 +27,12 @@
 <audio_platform_info>
     <acdb_ids>
         <!-- Output devices -->
+        <device name="SND_DEVICE_OUT_BT_SCO_WB" acdb_id="22" />
         <device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" acdb_id="18" />

invisiblek

#!/bin/bash

if [ "$1" == "careful" ]; then
  set -e
fi

PWD=`pwd`
count=0
source build/envsetup.sh > /dev/null
rm -f ~/.bin/repopicks-tmp

invisiblek

76738 # repopick: handle variant audio hal branching
78309 # m8 dont build dotcase
78310 # m8 disable overlays
77247 # TEMP d2 disable missing overlays
76917 # TEMP jf comment out overlays for now
78014 # gralloc: Add workaround for Jellybean camera drivers
78017 # display: Add flag to allow legacy allocations from MM heap
78023 # gralloc: Fix some differences with compatibility code
78066 # overlay: fw: increase brightness arrays
78224 # ota: Let devices specify their own recovery-from-boot.p installer

invisiblek

diff --git a/include/bt_target.h b/include/bt_target.h
index 96a62cc..cf24cd2 100644
--- a/include/bt_target.h
+++ b/include/bt_target.h
@@ -85,6 +85,9 @@
 #endif
 
 /* This feature is used to update any QCOM related changes in the stack*/
+#ifdef BLUETOOTH_QTI_SW
+#undef BLUETOOTH_QTI_SW

invisiblek

diff --git a/src/java/com/android/internal/telephony/PhoneFactory.java b/src/java/com/android/internal/telephony/PhoneFactory.java
index 1b90661..d047ef3 100644
--- a/src/java/com/android/internal/telephony/PhoneFactory.java
+++ b/src/java/com/android/internal/telephony/PhoneFactory.java
@@ -176,6 +176,7 @@ public class PhoneFactory {
                         }
                     }
                 }
+                try {Thread.sleep(3000);} catch (Exception e) {}
                 Rlog.i(LOG_TAG, "Creating SubscriptionController");

invisiblek

<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
**     http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software

invisiblek

diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index c2dd351..bdcf109 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -4825,6 +4825,16 @@ public class RIL extends BaseCommands implements CommandsInterface {
      */
     @Override
     public void setCellInfoListRate(int rateInMillis, Message response) {
+        if(mRilVersion < 10) {
+            if (response != null) {