summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2019-03-27 02:55:15 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-03-27 02:55:15 +0000
commit021ea66aead7824cc0974de0baa222719dd51676 (patch)
treed2f1b63fbedae09c2da8765c68b800f765326755 /core/java/android
parent88fb51277bf540f84408df6392db7ea8393c204d (diff)
parent266868246a4024295010a0fc9ecc475df34f8b24 (diff)
Merge "Use SystemApi framework parcelables directly"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/net/StaticIpConfiguration.aidl20
-rw-r--r--core/java/android/net/apf/ApfCapabilities.aidl20
2 files changed, 40 insertions, 0 deletions
diff --git a/core/java/android/net/StaticIpConfiguration.aidl b/core/java/android/net/StaticIpConfiguration.aidl
new file mode 100644
index 000000000000..8aac701fe7e1
--- /dev/null
+++ b/core/java/android/net/StaticIpConfiguration.aidl
@@ -0,0 +1,20 @@
+/*
+**
+** 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;
+
+@JavaOnlyStableParcelable parcelable StaticIpConfiguration; \ No newline at end of file
diff --git a/core/java/android/net/apf/ApfCapabilities.aidl b/core/java/android/net/apf/ApfCapabilities.aidl
new file mode 100644
index 000000000000..7c4d4c2da4bc
--- /dev/null
+++ b/core/java/android/net/apf/ApfCapabilities.aidl
@@ -0,0 +1,20 @@
+/*
+**
+** 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.apf;
+
+@JavaOnlyStableParcelable parcelable ApfCapabilities; \ No newline at end of file