summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <reminv@google.com>2019-03-26 11:40:34 +0900
committerRemi NGUYEN VAN <reminv@google.com>2019-03-26 12:05:27 +0900
commit266868246a4024295010a0fc9ecc475df34f8b24 (patch)
tree691e22a8bd6db055bf7ce33f03eaebf4db9d4e51 /core/java/android
parent64bb980f457d843026fd301e05b666a84441d96d (diff)
Use SystemApi framework parcelables directly
Remove StaticIpConfigurationParcelable and ApfCapabilitiesParcelable and use StaticIpConfiguration and ApfCapabilities directly. These two classes are SystemApi and defined in framework.jar, so no stability guarantee is needed: the parceled and unparceled class will always be the framework.jar version. Bug: 126477266 Fixes: 126477266 Test: atest FrameworksNetTests NetworkStackTests Test: flashed, booted, WiFi and captive portal works. Change-Id: Iaf80ae23e003752cc6d2300700021931923b6533
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