Merge "Cleanup. Changing voicemail_transcription_enabled to... (e74328e2) · Commits · e / os / android_packages_apps_Dialer

java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ public class VoicemailTosMessageCreator {
		return true;
		}

		if (isVoicemailTranscriptionEnabled() && !isLegacyVoicemailUser()) {
		if (isVoicemailTranscriptionAvailable() && !isLegacyVoicemailUser()) {
		LogUtil.i(
		"VoicemailTosMessageCreator.shouldShowTos", "showing TOS for Google transcription users");
		return true;
		@@ -203,7 +203,7 @@ public class VoicemailTosMessageCreator {
		return false;
		}

		if (isVoicemailTranscriptionEnabled()) {
		if (isVoicemailTranscriptionAvailable()) {
		LogUtil.i(
		"VoicemailTosMessageCreator.shouldShowPromo",
		"showing promo for Google transcription users");
		@@ -227,9 +227,10 @@ public class VoicemailTosMessageCreator {
		}
		}

		private boolean isVoicemailTranscriptionEnabled() {
		private boolean isVoicemailTranscriptionAvailable() {
		return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
		&& ConfigProviderBindings.get(context).getBoolean("voicemail_transcription_enabled", false);
		&& ConfigProviderBindings.get(context)
		.getBoolean("voicemail_transcription_available", false);
		}

		private void showDeclineTosDialog(final PhoneAccountHandle handle) {
		@@ -407,7 +408,7 @@ public class VoicemailTosMessageCreator {
		}

		private CharSequence getNewUserDialerTos() {
		if (!isVoicemailTranscriptionEnabled()) {
		if (!isVoicemailTranscriptionAvailable()) {
		return "";
		}

		@@ -416,7 +417,7 @@ public class VoicemailTosMessageCreator {
		}

		private CharSequence getExistingUserDialerTos() {
		if (!isVoicemailTranscriptionEnabled()) {
		if (!isVoicemailTranscriptionAvailable()) {
		return "";
		}

java/com/android/voicemail/impl/VoicemailClientImpl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ public class VoicemailClientImpl implements VoicemailClient {
		}

		TranscriptionConfigProvider provider = new TranscriptionConfigProvider(context);
		if (!provider.isVoicemailTranscriptionEnabled()) {
		if (!provider.isVoicemailTranscriptionAvailable()) {
		LogUtil.i(
		"VoicemailClientImpl.isVoicemailTranscriptionAvailable", "feature disabled by config");
		return false;

java/com/android/voicemail/impl/transcribe/TranscriptionConfigProvider.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -28,9 +28,10 @@ public class TranscriptionConfigProvider {
		this.context = context;
		}

		public boolean isVoicemailTranscriptionEnabled() {
		public boolean isVoicemailTranscriptionAvailable() {
		return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
		&& ConfigProviderBindings.get(context).getBoolean("voicemail_transcription_enabled", false);
		&& ConfigProviderBindings.get(context)
		.getBoolean("voicemail_transcription_available", false);
		}

		public String getServerAddress() {

java/com/android/voicemail/impl/transcribe/TranscriptionService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -142,8 +142,8 @@ public class TranscriptionService extends JobService {
		public boolean onStartJob(JobParameters params) {
		Assert.isMainThread();
		LogUtil.enterBlock("TranscriptionService.onStartJob");
		if (!getConfigProvider().isVoicemailTranscriptionEnabled()) {
		LogUtil.i("TranscriptionService.onStartJob", "transcription not enabled, exiting.");
		if (!getConfigProvider().isVoicemailTranscriptionAvailable()) {
		LogUtil.i("TranscriptionService.onStartJob", "transcription not available, exiting.");
		return false;
		} else if (TextUtils.isEmpty(getConfigProvider().getServerAddress())) {
		LogUtil.i("TranscriptionService.onStartJob", "transcription server not configured, exiting.");