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

Commit 9caac8bb authored by Santos Cordon's avatar Santos Cordon Committed by Android Git Automerger
Browse files

am f82589c7: Merge "Read headset state from audio manager instead of... 

am f82589c7: Merge "Read headset state from audio manager instead of calculating ourselves." into mnc-dr-dev

* commit 'f82589c7':
  Read headset state from audio manager instead of calculating ourselves.
parents e8e7b7b5 f82589c7

src/com/android/server/telecom/WiredHeadsetManager.java

+4 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class WiredHeadsetManager { 
        @Override

        public void onReceive(Context context, Intent intent) {

            if (intent.getAction().equals(Intent.ACTION_HEADSET_PLUG)) {

                boolean isPluggedIn = intent.getIntExtra("state", 0) == 1;

                boolean isPluggedIn = mAudioManager.isWiredHeadsetOn();

                Log.v(WiredHeadsetManager.this, "ACTION_HEADSET_PLUG event, plugged in: %b",

                        isPluggedIn);

                onHeadsetPluggedInChanged(isPluggedIn);
@@ -48,6 +48,7 @@ class WiredHeadsetManager { 
    }



    private final WiredHeadsetBroadcastReceiver mReceiver;

    private final AudioManager mAudioManager;

    private boolean mIsPluggedIn;

    /**

     * ConcurrentHashMap constructor params: 8 is initial table size, 0.9f is
@@ -60,8 +61,8 @@ class WiredHeadsetManager { 
    WiredHeadsetManager(Context context) {

        mReceiver = new WiredHeadsetBroadcastReceiver();



        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);

        mIsPluggedIn = audioManager.isWiredHeadsetOn();

        mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);

        mIsPluggedIn = mAudioManager.isWiredHeadsetOn();



        // Register for misc other intent broadcasts.

        IntentFilter intentFilter = new IntentFilter(Intent.ACTION_HEADSET_PLUG);