Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base-old
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

5256257f

Commit 5256257f authored 4 years ago by Greg Kaiser Committed by Automerger Merge Worker 4 years ago

Downloads
- Plain Diff

Merge "Revert "Add a system TextToSpeech implementation that initiates ...""...

Merge "Revert "Add a system TextToSpeech implementation that initiates ..."" into sc-dev am: a2584ca1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13608827

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I085f8e1c468348a53893e9628b7f8bc05c416a03

parents fe81dad6 a2584ca1

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

core/java/android/content/Context.java 0 additions, 8 deletions

core/java/android/content/Context.java
core/java/android/speech/tts/ITextToSpeechManager.aidl 0 additions, 29 deletions

core/java/android/speech/tts/ITextToSpeechManager.aidl
core/java/android/speech/tts/ITextToSpeechSession.aidl 0 additions, 33 deletions

core/java/android/speech/tts/ITextToSpeechSession.aidl
core/java/android/speech/tts/ITextToSpeechSessionCallback.aidl 0 additions, 32 deletions

...java/android/speech/tts/ITextToSpeechSessionCallback.aidl
core/java/android/speech/tts/TextToSpeech.java 27 additions, 141 deletions

core/java/android/speech/tts/TextToSpeech.java
services/Android.bp 0 additions, 2 deletions

services/Android.bp
services/core/java/com/android/server/infra/AbstractMasterSystemService.java 0 additions, 14 deletions

...com/android/server/infra/AbstractMasterSystemService.java
services/java/com/android/server/SystemServer.java 0 additions, 10 deletions

services/java/com/android/server/SystemServer.java
services/texttospeech/Android.bp 0 additions, 13 deletions

services/texttospeech/Android.bp
services/texttospeech/java/com/android/server/texttospeech/TextToSpeechManagerPerUserService.java 0 additions, 184 deletions

...erver/texttospeech/TextToSpeechManagerPerUserService.java
services/texttospeech/java/com/android/server/texttospeech/TextToSpeechManagerService.java 0 additions, 77 deletions

...droid/server/texttospeech/TextToSpeechManagerService.java

with 27 additions and 543 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment