From affa8a4736177f62911c9e0fe9280247c823e8bf Mon Sep 17 00:00:00 2001
From: Yohann Roussel <yroussel@google.com>
Date: Tue, 20 May 2014 16:11:54 +0200
Subject: [PATCH] Fix ANR in multidexlegacytestservices.

Continuous testing showed that the test is flaky because of ANR caused by too
long computation in onCreate(). So this change move computation in another
thread to free the main thread.

Change-Id: I2ecff3f3e659ff092dd4c7c230c35be4a5742c4b
---
 .../multidexlegacytestservices/AbstractService.java      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/src/com/android/framework/multidexlegacytestservices/AbstractService.java b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/src/com/android/framework/multidexlegacytestservices/AbstractService.java
index 20fe465f47044..7b83999d0ca91 100644
--- a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/src/com/android/framework/multidexlegacytestservices/AbstractService.java
+++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/src/com/android/framework/multidexlegacytestservices/AbstractService.java
@@ -31,7 +31,7 @@ import java.io.RandomAccessFile;
  * Empty service for testing legacy multidex. Access more than 64k methods but some are required at
  * init, some only at verification and others during execution.
  */
-public abstract class AbstractService extends Service {
+public abstract class AbstractService extends Service implements Runnable {
     private final String TAG = "MultidexLegacyTestService" + getId();
 
     private int instanceFieldNotInited;
@@ -47,6 +47,12 @@ public abstract class AbstractService extends Service {
     @Override
     public void onCreate() {
         Log.i(TAG, "onCreate");
+        new Thread(this).start();
+
+    }
+
+    @Override
+    public void run() {
         Context applicationContext = getApplicationContext();
         File resultFile = new File(applicationContext.getFilesDir(), getId());
         try {
@@ -84,7 +90,6 @@ public abstract class AbstractService extends Service {
         } catch (IOException e) {
             e.printStackTrace();
         }
-
     }
 
     @Override