commit 0cf6592278e43c0757622ae1796ec143a22fb63c
author Cody Kesting <ckesting@google.com> Mon Jul 08 10:21:07 2019 -0700
committer Cody Kesting <ckesting@google.com> Mon Jul 08 10:21:07 2019 -0700
tree 94b438183dea8c1b6af09f2cb35fe581def74e5c
parent 9867f50c68adfc0695631efa8691b6e61b9730c4

Fix potential NPE in ikev2 unit tests.

Bug: 137008522
Test: atest FrameworksIkeTests
Change-Id: Id679063db06540ed8737894fdf3311d2c8339af6

tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java

diff --git a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java b/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java
index 589d181..5d8d400 100644
--- a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java
+++ b/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java
@@ -160,7 +160,7 @@
 
     @Before
     public void setup() throws Exception {
-        if (Looper.myLooper() == null) Looper.myLooper().prepare();
+        if (Looper.myLooper() == null) Looper.prepare();
 
         mIkePrf =
                 IkeMacPrf.create(

tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java

diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java
index cbfa635..7e8b29c 100644
--- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java
+++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java
@@ -385,7 +385,7 @@
 
     @Before
     public void setUp() throws Exception {
-        if (Looper.myLooper() == null) Looper.myLooper().prepare();
+        if (Looper.myLooper() == null) Looper.prepare();
 
         mMockIpSecTestUtils = MockIpSecTestUtils.setUpMockIpSec();
         mIpSecManager = mMockIpSecTestUtils.getIpSecManager();

tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java

diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java
index 281fb1e..e4f38e3 100644
--- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java
+++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java
@@ -48,7 +48,7 @@
 
     @Before
     public void setUp() throws Exception {
-        if (Looper.myLooper() == null) Looper.myLooper().prepare();
+        if (Looper.myLooper() == null) Looper.prepare();
 
         mMockIpSecTestUtils = MockIpSecTestUtils.setUpMockIpSec();
         mIpSecManager = mMockIpSecTestUtils.getIpSecManager();

tests/iketests/src/java/com/android/ike/ikev2/IkeSocketTest.java

diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeSocketTest.java b/tests/iketests/src/java/com/android/ike/ikev2/IkeSocketTest.java
index 4062a2f..8da1d42 100644
--- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSocketTest.java
+++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSocketTest.java
@@ -141,7 +141,7 @@
 
     @Test
     public void testGetAndCloseIkeSocket() throws Exception {
-        if (Looper.myLooper() == null) Looper.myLooper().prepare();
+        if (Looper.myLooper() == null) Looper.prepare();
 
         IkeSocket ikeSocketOne = IkeSocket.getIkeSocket(mClientUdpEncapSocket);
         assertEquals(1, ikeSocketOne.mRefCount);
@@ -159,7 +159,7 @@
 
     @Test
     public void testSendIkePacket() throws Exception {
-        if (Looper.myLooper() == null) Looper.myLooper().prepare();
+        if (Looper.myLooper() == null) Looper.prepare();
 
         // Send IKE packet
         IkeSocket ikeSocket = IkeSocket.getIkeSocket(mClientUdpEncapSocket);