RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options.

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

diff --git a/Android.mk b/Android.mk
index bdb4555..edfc56f 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -203,6 +203,7 @@ LOCAL_SRC_FILES += \
        core/java/android/net/IIpConnectivityMetrics.aidl \
        core/java/android/net/IEthernetManager.aidl \
        core/java/android/net/IEthernetServiceListener.aidl \
+       core/java/android/net/INetdEventCallback.aidl \
        core/java/android/net/INetworkManagementEventObserver.aidl \
        core/java/android/net/INetworkPolicyListener.aidl \
        core/java/android/net/INetworkPolicyManager.aidl \
@@ -467,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.
@@ -577,6 +580,9 @@ aidl_files := \
        frameworks/base/graphics/java/android/graphics/drawable/Icon.aidl \
        frameworks/base/core/java/android/accounts/AuthenticatorDescription.aidl \
        frameworks/base/core/java/android/accounts/Account.aidl \
+       frameworks/base/core/java/android/app/admin/ConnectEvent.aidl \
+       frameworks/base/core/java/android/app/admin/DnsEvent.aidl \
+       frameworks/base/core/java/android/app/admin/NetworkEvent.aidl \
        frameworks/base/core/java/android/app/admin/SystemUpdatePolicy.aidl \
        frameworks/base/core/java/android/print/PrintDocumentInfo.aidl \
        frameworks/base/core/java/android/print/PageRange.aidl \