Stub two more QTI functions

AndroidManifest.xml

@@ -58,7 +58,6 @@
     <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-permission android:name="android.permission.READ_SMS" />
     <uses-permission android:name="android.permission.WRITE_SMS" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />
     <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" />
     <uses-permission android:name="android.permission.MANAGE_APP_OPS_MODES" />
@@ -227,9 +226,6 @@
             android:excludeFromRecents="true"
             android:theme="@android:style/Theme.Material.Light.Dialog.Alert"
             android:enabled="@bool/profile_supported_pbap">
-            <intent-filter>
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
         </activity>
         <service
             android:process="@string/process"

jni/com_android_bluetooth_a2dp.cpp

@@ -260,7 +260,8 @@ static std::vector<btav_a2dp_codec_config_t> prepareCodecPreferences(
 
 static void initNative(JNIEnv* env, jobject object,
                        jint maxConnectedAudioDevices,
-                       jobjectArray codecConfigArray) {
+                       jobjectArray codecConfigArray,
+                       jobjectArray codecConfigOffload) {
   std::unique_lock<std::shared_timed_mutex> interface_lock(interface_mutex);
   std::unique_lock<std::shared_timed_mutex> callbacks_lock(callbacks_mutex);
 
@@ -306,8 +307,10 @@ static void initNative(JNIEnv* env, jobject object,
   std::vector<btav_a2dp_codec_config_t> codec_priorities =
       prepareCodecPreferences(env, object, codecConfigArray);
 
+  std::vector<btav_a2dp_codec_config_t> offload_codec_supported =
+      prepareCodecPreferences(env, object, codecConfigOffload);
   bt_status_t status = sBluetoothA2dpInterface->init(
-      &sBluetoothA2dpCallbacks, maxConnectedAudioDevices, codec_priorities);
+      &sBluetoothA2dpCallbacks, maxConnectedAudioDevices, codec_priorities, offload_codec_supported);
   if (status != BT_STATUS_SUCCESS) {
     ALOGE("%s: Failed to initialize Bluetooth A2DP, status: %d", __func__,
           status);
@@ -475,7 +478,7 @@ static jboolean setCodecConfigPreferenceNative(JNIEnv* env, jobject object,
 
 static JNINativeMethod sMethods[] = {
     {"classInitNative", "()V", (void*)classInitNative},
-    {"initNative", "(I[Landroid/bluetooth/BluetoothCodecConfig;)V",
+    {"initNative", "(I[Landroid/bluetooth/BluetoothCodecConfig;[Landroid/bluetooth/BluetoothCodecConfig;)V",
      (void*)initNative},
     {"cleanupNative", "()V", (void*)cleanupNative},
     {"connectA2dpNative", "([B)Z", (void*)connectA2dpNative},

jni/com_android_bluetooth_gatt.cpp

@@ -1166,11 +1166,24 @@ void set_scan_params_cmpl_cb(int client_if, uint8_t status) {
 }
 
 static void gattSetScanParametersNative(JNIEnv* env, jobject object,
-                                        jint client_if, jint scan_interval_unit,
-                                        jint scan_window_unit) {
+                                        jint client_if, jint scan_phy,
+                                        jintArray scan_interval_unit,
+                                        jintArray scan_window_unit) {
+  std::vector<uint32_t> scan_interval = {0,0};
+  std::vector<uint32_t> scan_window = {0,0};
   if (!sGattIf) return;
+
+  int scan_int_cnt = env->GetArrayLength(scan_interval_unit);
+  if(scan_int_cnt > 0) {
+    env->GetIntArrayRegion(scan_interval_unit, 0, scan_int_cnt, (jint *)&scan_interval[0]);
+  }
+
+  int scan_window_cnt = env->GetArrayLength(scan_window_unit);
+  if(scan_window_cnt > 0) {
+    env->GetIntArrayRegion(scan_window_unit, 0, scan_window_cnt, (jint *)&scan_window[0]);
+  }
   sGattIf->scanner->SetScanParameters(
-      scan_interval_unit, scan_window_unit,
+      scan_phy, scan_interval, scan_window,
       base::Bind(&set_scan_params_cmpl_cb, client_if));
 }
 
@@ -2129,7 +2142,7 @@ static JNINativeMethod sScanMethods[] = {
      (void*)gattClientScanFilterClearNative},
     {"gattClientScanFilterEnableNative", "(IZ)V",
      (void*)gattClientScanFilterEnableNative},
-    {"gattSetScanParametersNative", "(III)V",
+    {"gattSetScanParametersNative", "(II[I[I)V",
      (void*)gattSetScanParametersNative},
 };