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

Commit b5189ed2 authored by Yan Yan's avatar Yan Yan Committed by android-build-merger
Browse files

Merge "Allow mainline IPsec(IKE) to statically include @PolicyDirection" 

am: 17d04f08

Change-Id: Id6e7ca961fd1dd781448f0ad84cef235e9c53dba
parents 4a0f894e 17d04f08

Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -586,6 +586,14 @@ java_library { 
    sdk_version: "current",

}



filegroup {

    name: "framework-ike-shared-srcs",

    visibility: ["//frameworks/opt/net/ike"],

    srcs: [

        "core/java/android/net/annotations/PolicyDirection.java",

    ],

}



filegroup {

    name: "framework-networkstack-shared-srcs",

    srcs: [

core/java/android/net/IpSecManager.java

+1 −8
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ package android.net; 


import static com.android.internal.util.Preconditions.checkNotNull;



import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.RequiresFeature;

import android.annotation.RequiresPermission;
@@ -26,6 +25,7 @@ import android.annotation.SystemService; 
import android.annotation.TestApi;

import android.content.Context;

import android.content.pm.PackageManager;

import android.net.annotations.PolicyDirection;

import android.os.Binder;

import android.os.ParcelFileDescriptor;

import android.os.RemoteException;
@@ -41,8 +41,6 @@ import dalvik.system.CloseGuard; 


import java.io.FileDescriptor;

import java.io.IOException;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.net.DatagramSocket;

import java.net.InetAddress;

import java.net.Socket;
@@ -78,11 +76,6 @@ public final class IpSecManager { 
     */

    public static final int DIRECTION_OUT = 1;



    /** @hide */

    @IntDef(value = {DIRECTION_IN, DIRECTION_OUT})

    @Retention(RetentionPolicy.SOURCE)

    public @interface PolicyDirection {}



    /**

     * The Security Parameter Index (SPI) 0 indicates an unknown or invalid index.

     *

core/java/android/net/annotations/PolicyDirection.java

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.net.annotations;



import android.annotation.IntDef;

import android.net.IpSecManager;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;



/**

 * IPsec traffic direction.

 *

 * <p>Mainline modules cannot reference hidden @IntDef. Moving this annotation to a separate class

 * to allow others to statically include it.

 *

 * @hide

 */

@IntDef(value = {IpSecManager.DIRECTION_IN, IpSecManager.DIRECTION_OUT})

@Retention(RetentionPolicy.SOURCE)

public @interface PolicyDirection {}