From e0d448f31eb9f7e63d13ef45b04853d95c00670a Mon Sep 17 00:00:00 2001
From: Benedict Wong <benedictwong@google.com>
Date: Tue, 23 Jan 2018 11:01:28 -0800
Subject: [PATCH] Expose applyTunnelModeTransform as a system API

Simple change to expose systemAPI for applyTunnelModeTransform

Bug: 36033193
Test: All CTS, unit tests passing
Change-Id: I2d857c048bc0dc80c3949387f946b1f5adf0527e
---
 api/system-current.txt                  | 1 +
 core/java/android/net/IpSecManager.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 98f2764858e98..30f901e0331cd 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -2578,6 +2578,7 @@ package android.net {
   }
 
   public final class IpSecManager {
+    method public void applyTunnelModeTransform(android.net.IpSecManager.IpSecTunnelInterface, int, android.net.IpSecTransform) throws java.io.IOException;
     method public android.net.IpSecManager.IpSecTunnelInterface createIpSecTunnelInterface(java.net.InetAddress, java.net.InetAddress, android.net.Network) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;
   }
 
diff --git a/core/java/android/net/IpSecManager.java b/core/java/android/net/IpSecManager.java
index f04f03f6b6172..6125394ab5e34 100644
--- a/core/java/android/net/IpSecManager.java
+++ b/core/java/android/net/IpSecManager.java
@@ -748,7 +748,7 @@ public final class IpSecManager {
      * @hide
      */
     @SystemApi
-    void applyTunnelModeTransform(IpSecTunnelInterface tunnel, int direction,
+    public void applyTunnelModeTransform(IpSecTunnelInterface tunnel, int direction,
             IpSecTransform transform) throws IOException {
         // TODO: call IpSecService
     }