commit d7aa055b61fdfc43a6d6bbfa7cd3442061dc5b7d
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 12 20:30:03 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 12 20:30:03 2020 +0000
tree 7e197e642edb19e9ca8bd0d98b314e0e4090aef9
parent 55119e823e068743ada99e63a53ae08a927cd92c
parent 003c5c980765c9cc0078ff1d92f03a8b454abdd6

Merge changes I37dd459d,I1959f308 into rvc-dev

* changes:
  Add tests for Tunnel, Transport mode application with released SPIs
  Use TransformRecord to get SPI instead of SpiRecord

services/core/java/com/android/server/IpSecService.java

diff --git a/services/core/java/com/android/server/IpSecService.java b/services/core/java/com/android/server/IpSecService.java
index 905c489..6402e07 100644
--- a/services/core/java/com/android/server/IpSecService.java
+++ b/services/core/java/com/android/server/IpSecService.java
@@ -1776,7 +1776,7 @@
             socketRecord =
                     userRecord.mEncapSocketRecords.getResourceOrThrow(c.getEncapSocketResourceId());
         }
-        SpiRecord spiRecord = userRecord.mSpiRecords.getResourceOrThrow(c.getSpiResourceId());
+        SpiRecord spiRecord = transformInfo.getSpiRecord();
 
         int mark =
                 (direction == IpSecManager.DIRECTION_OUT)
@@ -1809,7 +1809,7 @@
 
                 // Set outbound SPI only. We want inbound to use any valid SA (old, new) on rekeys,
                 // but want to guarantee outbound packets are sent over the new SA.
-                spi = transformInfo.getSpiRecord().getSpi();
+                spi = spiRecord.getSpi();
             }
 
             // Always update the policy with the relevant XFRM_IF_ID