commit 08163a380c7222704d708e1223a27c8a6cfccd22
author Ruben Brunk <rubenbrunk@google.com> Mon Jul 27 16:46:17 2015 -0700
committer Ruben Brunk <rubenbrunk@google.com> Mon Jul 27 16:46:17 2015 -0700
tree c011645f5b62dd42a9c79860aefa840e026341ff
parent 1f3a90fa32e2fe7798e2811adb4b25a64164c9b1

Avoid leaking eviction test service in tearDown.

Bug: 22658415
Change-Id: I5d5a35eab5d6a1c3b72620a4d19011e328bb9828

tests/tests/hardware/src/android/hardware/multiprocess/camera/cts/CameraEvictionTest.java

diff --git a/tests/tests/hardware/src/android/hardware/multiprocess/camera/cts/CameraEvictionTest.java b/tests/tests/hardware/src/android/hardware/multiprocess/camera/cts/CameraEvictionTest.java
index 3cf1dc7..668629b 100644
--- a/tests/tests/hardware/src/android/hardware/multiprocess/camera/cts/CameraEvictionTest.java
+++ b/tests/tests/hardware/src/android/hardware/multiprocess/camera/cts/CameraEvictionTest.java
@@ -121,7 +121,6 @@
 
     @Override
     protected void tearDown() throws Exception {
-        super.tearDown();
         if (mProcessPid != -1) {
             android.os.Process.killProcess(mProcessPid);
             mProcessPid = -1;
@@ -140,6 +139,7 @@
         }
         mContext = null;
         mActivityManager = null;
+        super.tearDown();
     }
 
     /**