RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options.

[android-x86/frameworks-base.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 730eeb1..edfc56f 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -126,6 +126,7 @@ LOCAL_SRC_FILES += \
        core/java/android/bluetooth/IBluetoothGatt.aidl \
        core/java/android/bluetooth/IBluetoothGattCallback.aidl \
        core/java/android/bluetooth/IBluetoothGattServerCallback.aidl \
+       core/java/android/bluetooth/IBluetoothDun.aidl \
        core/java/android/content/IClipboard.aidl \
        core/java/android/content/IContentService.aidl \
        core/java/android/content/IIntentReceiver.aidl \
@@ -275,6 +276,7 @@ LOCAL_SRC_FILES += \
        core/java/android/service/voice/IVoiceInteractionService.aidl \
        core/java/android/service/voice/IVoiceInteractionSession.aidl \
        core/java/android/service/voice/IVoiceInteractionSessionService.aidl \
+       core/java/android/service/gesture/IGestureService.aidl \
        core/java/android/service/wallpaper/IWallpaperConnection.aidl \
        core/java/android/service/wallpaper/IWallpaperEngine.aidl \
        core/java/android/service/wallpaper/IWallpaperService.aidl \
@@ -329,6 +331,7 @@ LOCAL_SRC_FILES += \
        core/java/com/android/internal/policy/IShortcutService.aidl \
        core/java/com/android/internal/os/IDropBoxManagerService.aidl \
        core/java/com/android/internal/os/IParcelFileDescriptorFactory.aidl \
+       core/java/com/android/internal/os/IRegionalizationService.aidl \
        core/java/com/android/internal/os/IResultReceiver.aidl \
        core/java/com/android/internal/statusbar/IStatusBar.aidl \
        core/java/com/android/internal/statusbar/IStatusBarService.aidl \
@@ -465,6 +468,8 @@ LOCAL_SRC_FILES += \
        packages/services/Proxy/com/android/net/IProxyPortListener.aidl \
        core/java/android/service/quicksettings/IQSService.aidl \
        core/java/android/service/quicksettings/IQSTileService.aidl \
+       telephony/java/com/android/internal/telephony/ISmsSecurityService.aidl \
+       telephony/java/com/android/internal/telephony/ISmsSecurityAgent.aidl \
 
 # The following are native binders that need to go with the native component
 # at system/update_engine/binder_bindings/. Use relative path to refer to them.
@@ -651,6 +656,7 @@ aidl_files := \
        frameworks/base/core/java/android/app/usage/UsageEvents.aidl \
        frameworks/base/core/java/android/app/Notification.aidl \
        frameworks/base/core/java/android/app/NotificationManager.aidl \
+       frameworks/base/core/java/android/app/NotificationGroup.aidl \
        frameworks/base/core/java/android/app/WallpaperInfo.aidl \
        frameworks/base/core/java/android/app/AppOpsManager.aidl \
        frameworks/base/core/java/android/app/ActivityManager.aidl \