[RTT2] Error code reconfiguration

Error code changes:
- Error code for overall failure
- Error code for individual failures
- Throw exception when trying to access invalid results

Bug: 65108607
Test: unit tests and integration tests
Change-Id: I72c1ba6df3c3c2092fd38ea3ab7d2de7d8574e49

2 files changed, 16 insertions, 24 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java
index e5068fb46..aacfe65ba 100644
--- a/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -163,8 +162,7 @@ public class RttServiceImplTest {
             mMockLooper.dispatchAll();
 
             // (4) verify that results dispatched
-            verify(mockCallback).onRangingResults(RangingResultCallback.STATUS_SUCCESS,
-                    results.get(i).second);
+            verify(mockCallback).onRangingResults(results.get(i).second);
 
             // (5) replicate results - shouldn't dispatch another callback
             mDut.onRangingResults(mIntCaptor.getValue(), results.get(i).first);
@@ -212,8 +210,7 @@ public class RttServiceImplTest {
 
         // verify that results with MAC addresses filtered out and replaced by PeerHandles issued
         // to callback
-        verify(mockCallback).onRangingResults(eq(RangingResultCallback.STATUS_SUCCESS),
-                mResultsCaptor.capture());
+        verify(mockCallback).onRangingResults(mResultsCaptor.capture());
 
         assertTrue(compareListContentsNoOrdering(results.second, mResultsCaptor.getValue()));
 
@@ -251,7 +248,7 @@ public class RttServiceImplTest {
 
             // (3) verify that failure callback dispatched (for the HAL failure)
             if (i == 0) {
-                verify(mockCallback).onRangingResults(RangingResultCallback.STATUS_FAIL, null);
+                verify(mockCallback).onRangingFailure(RangingResultCallback.STATUS_CODE_FAIL);
             }
 
             // (4) on failed HAL: even if native calls back with result we shouldn't dispatch
@@ -260,8 +257,7 @@ public class RttServiceImplTest {
             mMockLooper.dispatchAll();
 
             if (i != 0) {
-                verify(mockCallback).onRangingResults(RangingResultCallback.STATUS_SUCCESS,
-                        results.get(i).second);
+                verify(mockCallback).onRangingResults(results.get(i).second);
             }
         }
 
@@ -291,7 +287,7 @@ public class RttServiceImplTest {
         mDut.onRangingResults(mIntCaptor.getValue(), results.first);
         mMockLooper.dispatchAll();
 
-        verify(mockCallback).onRangingResults(eq(RangingResultCallback.STATUS_FAIL), isNull());
+        verify(mockCallback).onRangingFailure(eq(RangingResultCallback.STATUS_CODE_FAIL));
 
         verifyNoMoreInteractions(mockNative, mockCallback);
     }
@@ -343,8 +339,7 @@ public class RttServiceImplTest {
                 // before the binder death. The callback is called from the service - the app is
                 // dead so in reality this will throw a RemoteException which the service will
                 // handle correctly.
-                verify(mockCallback).onRangingResults(RangingResultCallback.STATUS_SUCCESS,
-                        results.get(i).second);
+                verify(mockCallback).onRangingResults(results.get(i).second);
             }
         }
 
@@ -378,7 +373,7 @@ public class RttServiceImplTest {
         mMockLooper.dispatchAll();
 
         // (5) verify that results dispatched
-        verify(mockCallback).onRangingResults(RangingResultCallback.STATUS_SUCCESS, results.second);
+        verify(mockCallback).onRangingResults(results.second);
 
         verifyNoMoreInteractions(mockNative, mockCallback);
     }
@@ -395,8 +390,7 @@ public class RttServiceImplTest {
         results.first.remove(0);
         RangingResult removed = results.second.remove(0);
         results.second.add(
-                new RangingResult(RangingResultCallback.STATUS_FAIL, removed.getMacAddress(), 0, 0,
-                        0, 0));
+                new RangingResult(RangingResult.STATUS_FAIL, removed.getMacAddress(), 0, 0, 0, 0));
 
         // (1) request ranging operation
         mDut.startRanging(mockIbinder, mPackageName, request, mockCallback);
@@ -410,8 +404,7 @@ public class RttServiceImplTest {
         mMockLooper.dispatchAll();
 
         // (5) verify that (full) results dispatched
-        verify(mockCallback).onRangingResults(eq(RangingResultCallback.STATUS_SUCCESS),
-                mResultsCaptor.capture());
+        verify(mockCallback).onRangingResults(mResultsCaptor.capture());
         assertTrue(compareListContentsNoOrdering(results.second, mResultsCaptor.getValue()));
 
         verifyNoMoreInteractions(mockNative, mockCallback);
diff --git a/tests/wifitests/src/com/android/server/wifi/rtt/RttTestUtils.java b/tests/wifitests/src/com/android/server/wifi/rtt/RttTestUtils.java
index 530535f97..a014878bf 100644
--- a/tests/wifitests/src/com/android/server/wifi/rtt/RttTestUtils.java
+++ b/tests/wifitests/src/com/android/server/wifi/rtt/RttTestUtils.java
@@ -23,7 +23,6 @@ import android.hardware.wifi.V1_0.RttStatus;
 import android.net.wifi.ScanResult;
 import android.net.wifi.rtt.RangingRequest;
 import android.net.wifi.rtt.RangingResult;
-import android.net.wifi.rtt.RangingResultCallback;
 import android.util.Pair;
 
 import libcore.util.HexEncoding;
@@ -97,19 +96,19 @@ public class RttTestUtils {
                 RangingResult rangingResult = null;
                 byte[] overrideMac = null;
                 if (peer instanceof RangingRequest.RttPeerAp) {
-                    rangingResult = new RangingResult(RangingResultCallback.STATUS_SUCCESS,
+                    rangingResult = new RangingResult(RangingResult.STATUS_SUCCESS,
                             macAddressToByteArray(
                                     ((RangingRequest.RttPeerAp) peer).scanResult.BSSID),
                             rangeCmBase++, rangeStdDevCmBase++, rssiBase++, rangeTimestampBase++);
                 } else if (peer instanceof RangingRequest.RttPeerAware) {
                     RangingRequest.RttPeerAware awarePeer = (RangingRequest.RttPeerAware) peer;
                     if (awarePeer.peerHandle != null) {
-                        rangingResult = new RangingResult(RangingResultCallback.STATUS_SUCCESS,
+                        rangingResult = new RangingResult(RangingResult.STATUS_SUCCESS,
                                 awarePeer.peerHandle, rangeCmBase++, rangeStdDevCmBase++,
                                 rssiBase++, rangeTimestampBase++);
                         overrideMac = awarePeer.peerMacAddress;
                     } else {
-                        rangingResult = new RangingResult(RangingResultCallback.STATUS_SUCCESS,
+                        rangingResult = new RangingResult(RangingResult.STATUS_SUCCESS,
                                 awarePeer.peerMacAddress, rangeCmBase++, rangeStdDevCmBase++,
                                 rssiBase++, rangeTimestampBase++);
                     }
@@ -118,13 +117,13 @@ public class RttTestUtils {
                 halResults.add(getMatchingRttResult(rangingResult, overrideMac));
             }
         } else {
-            results.add(new RangingResult(RangingResultCallback.STATUS_SUCCESS,
+            results.add(new RangingResult(RangingResult.STATUS_SUCCESS,
                     HexEncoding.decode("100102030405".toCharArray(), false), rangeCmBase++,
                     rangeStdDevCmBase++, rssiBase++, rangeTimestampBase++));
-            results.add(new RangingResult(RangingResultCallback.STATUS_SUCCESS,
+            results.add(new RangingResult(RangingResult.STATUS_SUCCESS,
                     HexEncoding.decode("1A0B0C0D0E0F".toCharArray(), false), rangeCmBase++,
                     rangeStdDevCmBase++, rssiBase++, rangeTimestampBase++));
-            results.add(new RangingResult(RangingResultCallback.STATUS_SUCCESS,
+            results.add(new RangingResult(RangingResult.STATUS_SUCCESS,
                     HexEncoding.decode("080908070605".toCharArray(), false), rangeCmBase++,
                     rangeStdDevCmBase++, rssiBase++, rangeTimestampBase++));
             halResults.add(getMatchingRttResult(results.get(0), null));
@@ -137,7 +136,7 @@ public class RttTestUtils {
 
     private static RttResult getMatchingRttResult(RangingResult rangingResult, byte[] overrideMac) {
         RttResult rttResult = new RttResult();
-        rttResult.status = rangingResult.getStatus() == RangingResultCallback.STATUS_SUCCESS
+        rttResult.status = rangingResult.getStatus() == RangingResult.STATUS_SUCCESS
                 ? RttStatus.SUCCESS : RttStatus.FAILURE;
         System.arraycopy(overrideMac == null ? rangingResult.getMacAddress() : overrideMac, 0,
                 rttResult.addr, 0, 6);