From 0bae77b8f0cdc6272abf56a831c8ebfa0e9ed6a0 Mon Sep 17 00:00:00 2001 From: Samuel Tan Date: Mon, 30 Nov 2015 18:17:19 -0800 Subject: [PATCH] Specify path for native PersistableBundle implementation Specify path for native PersistableBundle implementation in PersistableBundle.aidl. BUG: 25815410 Change-Id: If29b06604b938805d5250fe80e54ef9ea1e88365 --- core/java/android/os/PersistableBundle.aidl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/core/java/android/os/PersistableBundle.aidl b/core/java/android/os/PersistableBundle.aidl index 5b05873257c5b..94e86076308dc 100644 --- a/core/java/android/os/PersistableBundle.aidl +++ b/core/java/android/os/PersistableBundle.aidl @@ -2,19 +2,19 @@ ** ** Copyright 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 +** 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 +** 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 +** 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 PersistableBundle; +parcelable PersistableBundle cpp_header "binder/PersistableBundle.h";