From 8a16bd61085696e3b3ee5b6f9dfb9032175875d0 Mon Sep 17 00:00:00 2001
From: mdooley <mdooley@google.com>
Date: Fri, 18 Aug 2017 19:33:31 -0700
Subject: Fixing crash introduced in cl/165486104

The bug is that the backfill service calls a helper method to schedule transcription tasks,
but that helper method expects to be called on the main thread. The fix is just to post transcription requests on the main thread.

Bug: 64841228
Test: manual
PiperOrigin-RevId: 165781891
Change-Id: Ief9c81f11ffa50ef264cb812b06ca73d93cf0414
---
 .../voicemail/impl/transcribe/TranscriptionBackfillService.java   | 8 +++++++-
 .../android/voicemail/impl/transcribe/TranscriptionService.java   | 7 +++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionBackfillService.java b/java/com/android/voicemail/impl/transcribe/TranscriptionBackfillService.java
index d6e362014..f3c6e64f4 100644
--- a/java/com/android/voicemail/impl/transcribe/TranscriptionBackfillService.java
+++ b/java/com/android/voicemail/impl/transcribe/TranscriptionBackfillService.java
@@ -22,9 +22,11 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.support.annotation.WorkerThread;
 import android.support.v4.app.JobIntentService;
 import android.support.v4.os.BuildCompat;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.ThreadUtil;
 import com.android.dialer.constants.ScheduledJobIds;
 import java.util.List;
 
@@ -57,6 +59,7 @@ public class TranscriptionBackfillService extends JobIntentService {
   }
 
   @Override
+  @WorkerThread
   protected void onHandleWork(Intent intent) {
     LogUtil.enterBlock("TranscriptionBackfillService.onHandleWork");
 
@@ -67,7 +70,10 @@ public class TranscriptionBackfillService extends JobIntentService {
         "found " + untranscribed.size() + " untranscribed voicemails");
     // TODO(mdooley): Consider doing the actual transcriptions here instead of scheduling jobs.
     for (Uri uri : untranscribed) {
-      TranscriptionService.scheduleNewVoicemailTranscriptionJob(this, uri, false);
+      ThreadUtil.postOnUiThread(
+          () -> {
+            TranscriptionService.scheduleNewVoicemailTranscriptionJob(this, uri, false);
+          });
     }
   }
 
diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionService.java b/java/com/android/voicemail/impl/transcribe/TranscriptionService.java
index 509f25bed..2ca16fbf2 100644
--- a/java/com/android/voicemail/impl/transcribe/TranscriptionService.java
+++ b/java/com/android/voicemail/impl/transcribe/TranscriptionService.java
@@ -57,6 +57,7 @@ public class TranscriptionService extends JobService {
 
   // Schedule a task to transcribe the indicated voicemail, return true if transcription task was
   // scheduled.
+  @MainThread
   public static boolean scheduleNewVoicemailTranscriptionJob(
       Context context, Uri voicemailUri, boolean highPriority) {
     Assert.isMainThread();
@@ -86,6 +87,7 @@ public class TranscriptionService extends JobService {
   }
 
   // Cancel all transcription tasks
+  @MainThread
   public static void cancelTranscriptions(Context context) {
     Assert.isMainThread();
     LogUtil.enterBlock("TranscriptionService.cancelTranscriptions");
@@ -93,6 +95,7 @@ public class TranscriptionService extends JobService {
     scheduler.cancel(ScheduledJobIds.VVM_TRANSCRIPTION_JOB);
   }
 
+  @MainThread
   public TranscriptionService() {
     Assert.isMainThread();
   }
@@ -108,6 +111,7 @@ public class TranscriptionService extends JobService {
   }
 
   @Override
+  @MainThread
   public boolean onStartJob(JobParameters params) {
     Assert.isMainThread();
     LogUtil.enterBlock("TranscriptionService.onStartJob");
@@ -127,6 +131,7 @@ public class TranscriptionService extends JobService {
   }
 
   @Override
+  @MainThread
   public boolean onStopJob(JobParameters params) {
     Assert.isMainThread();
     LogUtil.enterBlock("TranscriptionService.onStopJob");
@@ -135,6 +140,7 @@ public class TranscriptionService extends JobService {
   }
 
   @Override
+  @MainThread
   public void onDestroy() {
     Assert.isMainThread();
     LogUtil.enterBlock("TranscriptionService.onDestroy");
@@ -186,6 +192,7 @@ public class TranscriptionService extends JobService {
 
   private class Callback implements JobCallback {
     @Override
+    @MainThread
     public void onWorkCompleted(JobWorkItem completedWorkItem) {
       Assert.isMainThread();
       LogUtil.i("TranscriptionService.Callback.onWorkCompleted", completedWorkItem.toString());
-- 
cgit v1.2.3