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

Commit 737ff0b2 authored by Mingming Yin's avatar Mingming Yin Committed by Steve Kondik
Browse files

frameworks/base: Add constants for call_state and vsid 

For DSDA, CallManager will call setParameters() to indicate
the call state changes between CS Multimode call,
CS GSM only call and IMS Multimode. Add constants for
call_state and vsid keys. Add pre-defined VSID and call
state constants.

Change-Id: I6add5f13d4a2ad5eacdf0750bbd402128d86f7cd
parent 42156292

media/java/android/media/AudioManager.java

+49 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, The Linux Foundation. All rights reserved.

 * Not a Contribution.

 *

 * Copyright (C) 2007 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -1475,6 +1478,52 @@ public class AudioManager { 
     */

    public static final int MODE_IN_COMMUNICATION   = AudioSystem.MODE_IN_COMMUNICATION;



    /* Calls states for Voice calls */

    /**

     * @hide Call state for inactive call state.

     */

    public static final int CALL_INACTIVE         = AudioSystem.CALL_INACTIVE;

    /**

     * @hide Call state for active call state.

     */

    public static final int CALL_ACTIVE           = AudioSystem.CALL_ACTIVE;

    /**

     * @hide Call state for hold call state.

     */

    public static final int CALL_HOLD             = AudioSystem.CALL_HOLD;

    /**

     * @hide Call state for local call hold state.

     */

    public static final int CALL_LOCAL_HOLD       = AudioSystem.CALL_LOCAL_HOLD;





    /* VSIDS for IMS, Multimode CS call and GSM CS call */

    /**

     * @hide VSID for CS call, Multimode.

     */

    public static final long VOICE_VSID           = AudioSystem.VOICE_VSID;

    /**

     * @hide VSID for CS call, GSM-only.

     */

    public static final long VOICE2_VSID          = AudioSystem.VOICE2_VSID;

    /**

     * @hide VSID for IMS call, Multimode.

     */

    public static final long IMS_VSID             = AudioSystem.IMS_VSID;





    /* Key used in setParameters for VSID and Call_state */

    /**

     * @hide Key for vsid used in setParameters.

     */

    public static final String VSID_KEY           = AudioSystem.VSID_KEY;



    /**

     * @hide Key for call_state used in setParameters.

     */

    public static final String CALL_STATE_KEY     = AudioSystem.CALL_STATE_KEY;





    /* Routing bits for setRouting/getRouting API */

    /**

     * Routing audio output to earpiece

media/java/android/media/AudioSystem.java

+26 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, The Linux Foundation. All rights reserved.

 * Not a Contribution.

 *

 * Copyright (C) 2006 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -89,6 +92,29 @@ public class AudioSystem 
    public static final int NUM_MODES               = 4;





    /* Call states for Voice calls */

    /* @hide Call state for inactive call state. */

    public static final int CALL_INACTIVE           = 0x1;

    /* @hide Call state for active call state. */

    public static final int CALL_ACTIVE             = 0x2;

    /* @hide Call state for hold call state. */

    public static final int CALL_HOLD               = 0x3;

    /* @hide Call state for local hold call state. */

    public static final int CALL_LOCAL_HOLD         = 0x4;



    /* @hide VSID for CS voice, Multimode */

    public static final long VOICE_VSID             = 0x10C01000;

    /* @hide VSID for CS Voice GSM-Only */

    public static final long VOICE2_VSID            = 0x10DC1000;

    /* @hide VSID for IMS Multimode */

    public static final long IMS_VSID               = 0x10C02000;



    /* @hide Key for vsid used in setParameters */

    public static final String VSID_KEY             = "vsid";



    /* @hide Key for call_state used in setParameters */

    public static final String CALL_STATE_KEY       = "call_state";



    /* Routing bits for the former setRouting/getRouting API */

    /** @deprecated */

    @Deprecated public static final int ROUTE_EARPIECE          = (1 << 0);