Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6e8867e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4422293 from dd56135a to pi-release 

Change-Id: Ie01f9db910fbc6d55356c895801bb547702387c7
parents b556b283 dd56135a

android/app/AndroidManifest.xml

+10 −9
Original line number Diff line number Diff line
@@ -326,12 +326,20 @@ 
        </service>

        <service

            android:process="@string/process"

            android:name = ".hid.HidService"

            android:enabled="@bool/profile_supported_hid">

            android:name = ".hid.HidHostService"

            android:enabled="@bool/profile_supported_hid_host">

            <intent-filter>

                <action android:name="android.bluetooth.IBluetoothHidHost" />

            </intent-filter>

        </service>

        <service

            android:process="@string/process"

            android:name = ".hid.HidDeviceService"

            android:enabled="@bool/profile_supported_hid_device">

            <intent-filter>

                <action android:name="android.bluetooth.IBluetoothHidDevice" />

            </intent-filter>

        </service>

        <service

            android:process="@string/process"

            android:name = ".hdp.HealthService"
@@ -387,12 +395,5 @@ 
                android:name="android.accounts.AccountAuthenticator"

                android:resource="@xml/authenticator" />

        </service>

        <service

            android:name = ".hid.HidDevService"

            android:enabled="@bool/profile_supported_hidd">

            <intent-filter>

                <action android:name="android.bluetooth.IBluetoothHidDevice" />

            </intent-filter>

        </service>

    </application>

</manifest>

android/app/jni/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ cc_library_shared { 
        "com_android_bluetooth_a2dp_sink.cpp",

        "com_android_bluetooth_avrcp.cpp",

        "com_android_bluetooth_avrcp_controller.cpp",

        "com_android_bluetooth_hid.cpp",

        "com_android_bluetooth_hidd.cpp",

        "com_android_bluetooth_hid_host.cpp",

        "com_android_bluetooth_hid_device.cpp",

        "com_android_bluetooth_hdp.cpp",

        "com_android_bluetooth_pan.cpp",

        "com_android_bluetooth_gatt.cpp",

android/app/jni/com_android_bluetooth.h

+2 −2
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ int register_com_android_bluetooth_avrcp(JNIEnv* env); 


int register_com_android_bluetooth_avrcp_controller(JNIEnv* env);



int register_com_android_bluetooth_hid(JNIEnv* env);

int register_com_android_bluetooth_hid_host(JNIEnv* env);



int register_com_android_bluetooth_hidd(JNIEnv* env);

int register_com_android_bluetooth_hid_device(JNIEnv* env);



int register_com_android_bluetooth_hdp(JNIEnv* env);

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1347,13 +1347,13 @@ jint JNI_OnLoad(JavaVM* jvm, void* reserved) { 
    return JNI_ERR;

  }



  status = android::register_com_android_bluetooth_hid(e);

  status = android::register_com_android_bluetooth_hid_host(e);

  if (status < 0) {

    ALOGE("jni hid registration failure: %d", status);

    return JNI_ERR;

  }



  status = android::register_com_android_bluetooth_hidd(e);

  status = android::register_com_android_bluetooth_hid_device(e);

  if (status < 0) {

    ALOGE("jni hidd registration failure: %d", status);

    return JNI_ERR;

android/app/jni/com_android_bluetooth_hidd.cpp→android/app/jni/com_android_bluetooth_hid_device.cpp

+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define LOG_TAG "BluetoothHidDevServiceJni"

#define LOG_TAG "BluetoothHidDeviceServiceJni"



#define LOG_NDEBUG 0
@@ -473,9 +473,9 @@ static JNINativeMethod sMethods[] = { 
    {"disconnectNative", "()Z", (void*)disconnectNative},

};



int register_com_android_bluetooth_hidd(JNIEnv* env) {

int register_com_android_bluetooth_hid_device(JNIEnv* env) {

  return jniRegisterNativeMethods(env,

                                  "com/android/bluetooth/hid/HidDevService",

                                  "com/android/bluetooth/hid/HidDeviceService",

                                  sMethods, NELEM(sMethods));

}

}
 
}  // namespace android