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

Commit 98947a79 authored by Yuyang Huang's avatar Yuyang Huang Committed by Automerger Merge Worker
Browse files

Merge "Skip mAudioManager callback if it is null" am: edbc8dd7 am: e536a797 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2537593



Change-Id: I342c081134ea8fe2deecb3cf0255d81889caedda
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5cdf7397 e536a797

android/app/src/com/android/bluetooth/hearingaid/HearingAidService.java

+10 −2
Original line number Diff line number Diff line
@@ -748,7 +748,11 @@ public class HearingAidService extends ProfileService { 
                    if (DBG) {

                        Log.d(TAG, " onAudioDevicesRemoved: device type: " + deviceInfo.getType());

                    }

                    if (mAudioManager != null) {

                        mAudioManager.unregisterAudioDeviceCallback(this);

                    } else {

                        Log.w(TAG, "onAudioDevicesRemoved: mAudioManager is null");

                    }

                }

            }

        }
@@ -764,7 +768,11 @@ public class HearingAidService extends ProfileService { 
                    if (DBG) {

                        Log.d(TAG, " onAudioDevicesAdded: device type: " + deviceInfo.getType());

                    }

                    if (mAudioManager != null) {

                        mAudioManager.unregisterAudioDeviceCallback(this);

                    } else {

                        Log.w(TAG, "onAudioDevicesAdded: mAudioManager is null");

                    }

                }

            }

        }