diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-02-19 04:20:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-19 04:20:33 +0000 |
| commit | 8f577fc4165fa3786884268efc29c70f118ac720 (patch) | |
| tree | 0f92cf5d77ef3be38c6218fbbc5d465a972f5823 /core/java | |
| parent | 6c458c641a6843bd251734770aa2514eb493a798 (diff) | |
| parent | 2971a5e8ba1666179a8b11cf08f9bd0fd36502e4 (diff) | |
Merge "Split parcelable .aidl files to aidl-export" am: 09bbad130d am: 2971a5e8ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589694
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5ec4e1ad60bd8081ef37641722e247464ecd34e9
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/ConnectivityMetricsEvent.aidl | 20 | ||||
| -rw-r--r-- | core/java/android/net/InterfaceConfiguration.aidl | 19 | ||||
| -rw-r--r-- | core/java/android/net/UidRange.aidl | 24 |
3 files changed, 63 insertions, 0 deletions
diff --git a/core/java/android/net/ConnectivityMetricsEvent.aidl b/core/java/android/net/ConnectivityMetricsEvent.aidl new file mode 100644 index 000000000000..1c541dc4c8cc --- /dev/null +++ b/core/java/android/net/ConnectivityMetricsEvent.aidl @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2016 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; + +/** {@hide} */ +parcelable ConnectivityMetricsEvent; diff --git a/core/java/android/net/InterfaceConfiguration.aidl b/core/java/android/net/InterfaceConfiguration.aidl new file mode 100644 index 000000000000..8aa5e3452853 --- /dev/null +++ b/core/java/android/net/InterfaceConfiguration.aidl @@ -0,0 +1,19 @@ +/** + * Copyright (c) 2008, 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; + +parcelable InterfaceConfiguration; diff --git a/core/java/android/net/UidRange.aidl b/core/java/android/net/UidRange.aidl new file mode 100644 index 000000000000..f70fc8e2fefd --- /dev/null +++ b/core/java/android/net/UidRange.aidl @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2018 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; + +/** + * An inclusive range of UIDs. + * + * {@hide} + */ +parcelable UidRange;
\ No newline at end of file |