diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-01-14 20:20:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-01-14 20:20:05 +0000 |
| commit | 20330218ff9345277d8a3c81e5cde9d2f7e7e7c1 (patch) | |
| tree | b083c8bcae8ea4d9cc6cd41738d011fd9b1efe0e /core/java/android | |
| parent | a7fdcc92bce9e05bc9b9044a35d28c780345917c (diff) | |
| parent | 6c93f8d18a111ce9fc65aa71f3cbf58d78d44875 (diff) | |
Merge changes from topic "am-f9ab841782c043dd94dd83b30968e972"
* changes:
Merge changes from topic "cellinfocallback-error" am: 360e25280c am: ed0c722aad am: 28d31b21c4
Add AIDL for ParcelableException am: d2715b7c70 am: 910a4c60ab am: ef9221ee72
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/ParcelableException.aidl | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/core/java/android/os/ParcelableException.aidl b/core/java/android/os/ParcelableException.aidl new file mode 100644 index 000000000000..d21492212341 --- /dev/null +++ b/core/java/android/os/ParcelableException.aidl @@ -0,0 +1,18 @@ +/* Copyright 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.os; + +parcelable ParcelableException; |