Merge "Whitelist DMAgent from bg check" into oc-dev am: fcfb396f5e

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

diff --git a/Android.mk b/Android.mk
index a43369b..ffdb3ea 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -102,6 +102,7 @@ LOCAL_SRC_FILES += \
        core/java/android/app/IUserSwitchObserver.aidl \
        core/java/android/app/IWallpaperManager.aidl \
        core/java/android/app/IWallpaperManagerCallback.aidl \
+       core/java/android/app/admin/IDeviceAdminService.aidl \
        core/java/android/app/admin/IDevicePolicyManager.aidl \
        core/java/android/app/trust/IStrongAuthTracker.aidl \
        core/java/android/app/trust/ITrustManager.aidl \
@@ -278,6 +279,10 @@ LOCAL_SRC_FILES += \
        core/java/android/service/carrier/ICarrierService.aidl \
        core/java/android/service/carrier/ICarrierMessagingCallback.aidl \
        core/java/android/service/carrier/ICarrierMessagingService.aidl \
+       core/java/android/service/euicc/IDownloadSubscriptionCallback.aidl \
+       core/java/android/service/euicc/IEuiccService.aidl \
+       core/java/android/service/euicc/IGetDownloadableSubscriptionMetadataCallback.aidl \
+       core/java/android/service/euicc/IGetEidCallback.aidl \
        core/java/android/service/gatekeeper/IGateKeeperService.aidl \
        core/java/android/service/notification/INotificationListener.aidl \
        core/java/android/service/notification/IStatusBarNotificationHolder.aidl \
@@ -320,6 +325,8 @@ LOCAL_SRC_FILES += \
        core/java/android/service/wallpaper/IWallpaperService.aidl \
        core/java/android/service/chooser/IChooserTargetService.aidl \
        core/java/android/service/chooser/IChooserTargetResult.aidl \
+       core/java/android/service/resolver/IResolverRankerService.aidl \
+       core/java/android/service/resolver/IResolverRankerResult.aidl \
        core/java/android/text/ITextClassificationService.aidl \
        core/java/android/view/accessibility/IAccessibilityInteractionConnection.aidl\
        core/java/android/view/accessibility/IAccessibilityInteractionConnectionCallback.aidl\
@@ -516,6 +523,7 @@ LOCAL_SRC_FILES += \
        telephony/java/com/android/internal/telephony/ITelephony.aidl \
        telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
        telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
+       telephony/java/com/android/internal/telephony/euicc/IEuiccController.aidl \
        wifi/java/android/net/wifi/IWifiManager.aidl \
        wifi/java/android/net/wifi/aware/IWifiAwareEventCallback.aidl \
        wifi/java/android/net/wifi/aware/IWifiAwareManager.aidl \
@@ -612,6 +620,8 @@ aidl_files := \
        frameworks/base/telephony/java/android/telephony/IccOpenLogicalChannelResponse.aidl \
        frameworks/base/telephony/java/android/telephony/NeighboringCellInfo.aidl \
        frameworks/base/telephony/java/android/telephony/ModemActivityInfo.aidl \
+       frameworks/base/telephony/java/android/telephony/UiccAccessRule.aidl \
+       frameworks/base/telephony/java/android/telephony/euicc/DownloadableSubscription.aidl \
        frameworks/base/location/java/android/location/Location.aidl \
        frameworks/base/location/java/android/location/Address.aidl \
        frameworks/base/location/java/android/location/Criteria.aidl \
@@ -724,11 +734,14 @@ aidl_files := \
        frameworks/base/core/java/android/view/textservice/SuggestionsInfo.aidl \
        frameworks/base/core/java/android/service/carrier/CarrierIdentifier.aidl \
        frameworks/base/core/java/android/service/carrier/MessagePdu.aidl \
+       frameworks/base/core/java/android/service/euicc/DownloadResult.aidl \
+       frameworks/base/core/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.aidl \
        frameworks/base/core/java/android/service/notification/Adjustment.aidl \
        frameworks/base/core/java/android/service/notification/Condition.aidl \
        frameworks/base/core/java/android/service/notification/SnoozeCriterion.aidl \
        frameworks/base/core/java/android/service/notification/StatusBarNotification.aidl \
        frameworks/base/core/java/android/service/chooser/ChooserTarget.aidl \
+       frameworks/base/core/java/android/service/resolver/ResolverTarget.aidl \
        frameworks/base/core/java/android/speech/tts/Voice.aidl \
        frameworks/base/core/java/android/app/usage/CacheQuotaHint.aidl \
        frameworks/base/core/java/android/app/usage/ExternalStorageStats.aidl \