From bb392ba5f72fac676d5a1454846d4713d2cd7ef5 Mon Sep 17 00:00:00 2001 From: Nick Pelly Date: Mon, 22 Apr 2013 15:52:03 +1000 Subject: [PATCH] Add ContentValues & CursorWindow to framework.aidl By adding these stubs, they will be automatically added to framework.aidl in sdk builds. This makes it easier for unbundled apps to pass these objects across AIDL calls. ContentValues & CursorWindow are already public Parcelables. It is an oversight that they were not already in framework.aidl. There are a lot of other public Parcelables that are missing from framework.aidl. This just fixes two commonly requested ones. Change-Id: If61e19b1206da1680413d9ea03de87a90b6d233e --- Android.mk | 4 +++- core/java/android/content/ContentValues.aidl | 19 +++++++++++++++++++ core/java/android/database/CursorWindow.aidl | 19 +++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 core/java/android/content/ContentValues.aidl create mode 100644 core/java/android/database/CursorWindow.aidl diff --git a/Android.mk b/Android.mk index bd88877b5841a..849ec8cb1a395 100644 --- a/Android.mk +++ b/Android.mk @@ -282,15 +282,17 @@ aidl_files := \ frameworks/base/core/java/android/accounts/IAccountAuthenticatorResponse.aidl \ frameworks/base/core/java/android/app/Notification.aidl \ frameworks/base/core/java/android/app/PendingIntent.aidl \ + frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \ frameworks/base/core/java/android/bluetooth/BluetoothDevice.aidl \ frameworks/base/core/java/android/bluetooth/BluetoothHealthAppConfiguration.aidl \ frameworks/base/core/java/android/content/ComponentName.aidl \ + frameworks/base/core/java/android/content/ContentValues.aidl \ frameworks/base/core/java/android/content/Intent.aidl \ frameworks/base/core/java/android/content/IntentSender.aidl \ frameworks/base/core/java/android/content/PeriodicSync.aidl \ frameworks/base/core/java/android/content/SyncStats.aidl \ frameworks/base/core/java/android/content/res/Configuration.aidl \ - frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \ + frameworks/base/core/java/android/database/CursorWindow.aidl \ frameworks/base/core/java/android/net/Uri.aidl \ frameworks/base/core/java/android/nfc/NdefMessage.aidl \ frameworks/base/core/java/android/nfc/NdefRecord.aidl \ diff --git a/core/java/android/content/ContentValues.aidl b/core/java/android/content/ContentValues.aidl new file mode 100644 index 0000000000000..23d51d84e5a91 --- /dev/null +++ b/core/java/android/content/ContentValues.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2013 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.content; + +parcelable ContentValues; diff --git a/core/java/android/database/CursorWindow.aidl b/core/java/android/database/CursorWindow.aidl new file mode 100644 index 0000000000000..5809355206314 --- /dev/null +++ b/core/java/android/database/CursorWindow.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2013 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.database; + +parcelable CursorWindow;