From 383742c16d3dcbfcf748a89f0cb88ac8d2b31bb5 Mon Sep 17 00:00:00 2001
From: Svetoslav Ganov <svetoslavganov@google.com>
Date: Thu, 9 Dec 2010 11:52:47 -0800
Subject: [PATCH] 3205857 java.lang.ExceptionInInitializerError at
 java.lang.Class.newInstanceImpl(Native Method)

Change-Id: I72ab33da2f5cc0bbaa89f3b996ff4ac48deadf73
---
 .../AccessibilityManagerServiceTest.java      | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/services/tests/servicestests/src/com/android/server/AccessibilityManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/AccessibilityManagerServiceTest.java
index f6e3a8297f611..2bc68250a9a75 100644
--- a/services/tests/servicestests/src/com/android/server/AccessibilityManagerServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/AccessibilityManagerServiceTest.java
@@ -60,11 +60,6 @@ public class AccessibilityManagerServiceTest extends AndroidTestCase {
      */
     private static final long TIMEOUT_TEST_NOTIFICATION_TIMEOUT = 300;
 
-    /**
-     * The package name.
-     */
-    private static String sPackageName;
-
     /**
      * The interface used to talk to the tested service.
      */
@@ -73,8 +68,15 @@ public class AccessibilityManagerServiceTest extends AndroidTestCase {
     @Override
     public void setContext(Context context) {
         super.setContext(context);
-        if (sPackageName == null) {
-            sPackageName = context.getPackageName();
+        if (MyFirstMockAccessibilityService.sComponentName == null) {
+            MyFirstMockAccessibilityService.sComponentName = new ComponentName(
+                    context.getPackageName(), MyFirstMockAccessibilityService.class.getName())
+                    .flattenToShortString();
+        }
+        if (MySecondMockAccessibilityService.sComponentName == null) {
+            MySecondMockAccessibilityService.sComponentName = new ComponentName(
+                    context.getPackageName(), MySecondMockAccessibilityService.class.getName())
+                    .flattenToShortString();
         }
     }
 
@@ -683,10 +685,7 @@ public class AccessibilityManagerServiceTest extends AndroidTestCase {
         /**
          * The service {@link ComponentName} flattened as a string.
          */
-        static final String sComponentName = new ComponentName(
-                sPackageName,
-                MyFirstMockAccessibilityService.class.getName()
-                ).flattenToShortString();
+        static String sComponentName;
 
         /**
          * Handle to the service instance.
@@ -709,10 +708,7 @@ public class AccessibilityManagerServiceTest extends AndroidTestCase {
         /**
          * The service {@link ComponentName} flattened as a string.
          */
-        static final String sComponentName = new ComponentName(
-                sPackageName,
-                MySecondMockAccessibilityService.class.getName()
-                ).flattenToShortString();
+        static String sComponentName;
 
         /**
          * Handle to the service instance.