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

Commit 900e1f11 authored by Kohsuke Yatoh's avatar Kohsuke Yatoh
Browse files

Have Telecom service notify AudioService of RTT call state. 

Add AudioManager#setRttEnabled() so that Telecom service can call it
when RTT call state has changed.

Bug: 147037345
Test: Force installed Gboard 8.3.6 and verified voice typing works in
  simulated RTT call and simulated RTT upgrade call.
Change-Id: I1ea3dccdfed145e55b1b1cd516b40a33ac7984d9
parent a8a6e271

media/java/android/media/AudioManager.java

+14 −0
Original line number Diff line number Diff line
@@ -5987,6 +5987,20 @@ public class AudioManager { 
        }

    }



    /**

     * Set whether or not there is an active RTT call.

     * This method should be called by Telecom service.

     * @hide

     * TODO: make this a @SystemApi

     */

    public static void setRttEnabled(boolean rttEnabled) {

        try {

            getService().setRttEnabled(rttEnabled);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    //---------------------------------------------------------

    // Inner classes

    //--------------------

media/java/android/media/IAudioService.aidl

+2 −0
Original line number Diff line number Diff line
@@ -292,6 +292,8 @@ interface IAudioService { 
    oneway void unregisterStrategyPreferredDeviceDispatcher(

            IStrategyPreferredDeviceDispatcher dispatcher);



    oneway void setRttEnabled(in boolean rttEnabled);



    // WARNING: read warning at top of file, new methods that need to be used by native

    // code via IAudioManager.h need to be added to the top section.

}

services/core/java/com/android/server/audio/AudioService.java

+26 −11
Original line number Diff line number Diff line
@@ -634,6 +634,9 @@ public class AudioService extends IAudioService.Stub 
        }

    };



    @GuardedBy("mSettingsLock")

    private boolean mRttEnabled = false;



    ///////////////////////////////////////////////////////////////////////////

    // Construction

    ///////////////////////////////////////////////////////////////////////////
@@ -1053,7 +1056,7 @@ public class AudioService extends IAudioService.Stub 
            sendEncodedSurroundMode(mContentResolver, "onAudioServerDied");

            sendEnabledSurroundFormats(mContentResolver, true);

            updateAssistantUId(true);

            updateRttEanbled(mContentResolver);

            AudioSystem.setRttEnabled(mRttEnabled);

        }

        synchronized (mAccessibilityServiceUidsLock) {

            AudioSystem.setA11yServicesUids(mAccessibilityServiceUids);
@@ -1598,12 +1601,6 @@ public class AudioService extends IAudioService.Stub 
        }

    }



    private void updateRttEanbled(ContentResolver cr) {

        final boolean rttEnabled = Settings.Secure.getIntForUser(cr,

                    Settings.Secure.RTT_CALLING_MODE, 0, UserHandle.USER_CURRENT) != 0;

        AudioSystem.setRttEnabled(rttEnabled);

    }



    private void readPersistedSettings() {

        final ContentResolver cr = mContentResolver;
@@ -1648,7 +1645,7 @@ public class AudioService extends IAudioService.Stub 
            sendEncodedSurroundMode(cr, "readPersistedSettings");

            sendEnabledSurroundFormats(cr, true);

            updateAssistantUId(true);

            updateRttEanbled(cr);

            AudioSystem.setRttEnabled(mRttEnabled);

        }



        mMuteAffectedStreams = System.getIntForUser(cr,
@@ -3684,6 +3681,27 @@ public class AudioService extends IAudioService.Stub 
        return mIsCallScreeningModeSupported;

    }



    /** @see AudioManager#setRttEnabled() */

    @Override

    public void setRttEnabled(boolean rttEnabled) {

        if (mContext.checkCallingOrSelfPermission(

                android.Manifest.permission.MODIFY_PHONE_STATE)

                != PackageManager.PERMISSION_GRANTED) {

            Log.w(TAG, "MODIFY_PHONE_STATE Permission Denial: setRttEnabled from pid="

                    + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid());

            return;

        }

        synchronized (mSettingsLock) {

            mRttEnabled = rttEnabled;

            final long identity = Binder.clearCallingIdentity();

            try {

                AudioSystem.setRttEnabled(rttEnabled);

            } finally {

                Binder.restoreCallingIdentity(identity);

            }

        }

    }



    //==========================================================================================

    // Sound Effects

    //==========================================================================================
@@ -5825,8 +5843,6 @@ public class AudioService extends IAudioService.Stub 


            mContentResolver.registerContentObserver(Settings.Secure.getUriFor(

                    Settings.Secure.VOICE_INTERACTION_SERVICE), false, this);

            mContentResolver.registerContentObserver(Settings.Secure.getUriFor(

                    Settings.Secure.RTT_CALLING_MODE), false, this);

        }



        @Override
@@ -5850,7 +5866,6 @@ public class AudioService extends IAudioService.Stub 
                updateEncodedSurroundOutput();

                sendEnabledSurroundFormats(mContentResolver, mSurroundModeChanged);

                updateAssistantUId(false);

                updateRttEanbled(mContentResolver);

            }

        }