diff options
author | Justin Klaassen <justinklaassen@google.com> | 2017-10-10 15:20:13 -0400 |
---|---|---|
committer | Justin Klaassen <justinklaassen@google.com> | 2017-10-10 15:20:13 -0400 |
commit | 93b7ee4fce01df52a6607f0b1965cbafdfeaf1a6 (patch) | |
tree | 49f76f879a89c256a4f65b674086be50760bdffb /android/system | |
parent | bc81c7ada5aab3806dd0b17498f5c9672c9b33c4 (diff) | |
download | android-28-93b7ee4fce01df52a6607f0b1965cbafdfeaf1a6.tar.gz |
Import Android SDK Platform P [4386628]
/google/data/ro/projects/android/fetch_artifact \
--bid 4386628 \
--target sdk_phone_armv7-win_sdk \
sdk-repo-linux-sources-4386628.zip
AndroidVersion.ApiLevel has been modified to appear as 28
Change-Id: I9b8400ac92116cae4f033d173f7a5682b26ccba9
Diffstat (limited to 'android/system')
-rw-r--r-- | android/system/Os.java | 1 | ||||
-rw-r--r-- | android/system/StructGroupSourceReq.java | 41 |
2 files changed, 0 insertions, 42 deletions
diff --git a/android/system/Os.java b/android/system/Os.java index 5b9ff476..8e312ddc 100644 --- a/android/system/Os.java +++ b/android/system/Os.java @@ -516,7 +516,6 @@ public final class Os { /** @hide */ public static void setsockoptIpMreqn(FileDescriptor fd, int level, int option, int value) throws ErrnoException { Libcore.os.setsockoptIpMreqn(fd, level, option, value); } /** @hide */ public static void setsockoptGroupReq(FileDescriptor fd, int level, int option, StructGroupReq value) throws ErrnoException { Libcore.os.setsockoptGroupReq(fd, level, option, value); } - /** @hide */ public static void setsockoptGroupSourceReq(FileDescriptor fd, int level, int option, StructGroupSourceReq value) throws ErrnoException { Libcore.os.setsockoptGroupSourceReq(fd, level, option, value); } /** @hide */ public static void setsockoptLinger(FileDescriptor fd, int level, int option, StructLinger value) throws ErrnoException { Libcore.os.setsockoptLinger(fd, level, option, value); } /** @hide */ public static void setsockoptTimeval(FileDescriptor fd, int level, int option, StructTimeval value) throws ErrnoException { Libcore.os.setsockoptTimeval(fd, level, option, value); } diff --git a/android/system/StructGroupSourceReq.java b/android/system/StructGroupSourceReq.java deleted file mode 100644 index c300338f..00000000 --- a/android/system/StructGroupSourceReq.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2014 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.system; - -import java.net.InetAddress; -import libcore.util.Objects; - -/** - * Corresponds to C's {@code struct group_source_req}. - * - * @hide - */ -public final class StructGroupSourceReq { - public final int gsr_interface; - public final InetAddress gsr_group; - public final InetAddress gsr_source; - - public StructGroupSourceReq(int gsr_interface, InetAddress gsr_group, InetAddress gsr_source) { - this.gsr_interface = gsr_interface; - this.gsr_group = gsr_group; - this.gsr_source = gsr_source; - } - - @Override public String toString() { - return Objects.toString(this); - } -} |