Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9aff8a9 authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

Merge "HFP: Fix clearAdapterService call in unit tests" am: f0beb508 

am: f7c0f5ab

Change-Id: Ib8f3e3f3fda95aa1e715aedffcece1c1b43bfbba
parents 588e268b f7c0f5ab

android/app/tests/unit/src/com/android/bluetooth/hfp/HeadsetServiceTest.java

+2 −2
Original line number Diff line number Diff line
@@ -103,9 +103,9 @@ public class HeadsetServiceTest { 
    @AfterClass

    public static void tearDownClassOnlyOnce() throws Exception {

        Method method =

                AdapterService.class.getDeclaredMethod("clearAdapterService");

                AdapterService.class.getDeclaredMethod("clearAdapterService", AdapterService.class);

        method.setAccessible(true);

        method.invoke(null);

        method.invoke(null, sAdapterService);

        sAdapterService = null;

        method = HeadsetObjectsFactory.class.getDeclaredMethod("setInstanceForTesting",

                HeadsetObjectsFactory.class);

android/app/tests/unit/src/com/android/bluetooth/hfp/HeadsetStateMachineTest.java

+2 −2
Original line number Diff line number Diff line
@@ -85,9 +85,9 @@ public class HeadsetStateMachineTest { 
    @AfterClass

    public static void tearDownOnlyOnce() throws Exception {

        Method method =

                AdapterService.class.getDeclaredMethod("clearAdapterService");

                AdapterService.class.getDeclaredMethod("clearAdapterService", AdapterService.class);

        method.setAccessible(true);

        method.invoke(null);

        method.invoke(null, sAdapterService);

        sAdapterService = null;

    }