Merge "Change protection level of companion permissions" into oc-dev am: 897f883409

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

diff --git a/Android.mk b/Android.mk
index e58f306..8bb366a 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -157,6 +157,7 @@ LOCAL_SRC_FILES += \
        core/java/android/content/ISyncServiceAdapter.aidl \
        core/java/android/content/ISyncStatusObserver.aidl \
        core/java/android/content/om/IOverlayManager.aidl \
+       core/java/android/content/pm/IDexModuleRegisterCallback.aidl \
        core/java/android/content/pm/ILauncherApps.aidl \
        core/java/android/content/pm/IOnAppsChangedListener.aidl \
        core/java/android/content/pm/IOnPermissionsChangeListener.aidl \
@@ -215,6 +216,9 @@ LOCAL_SRC_FILES += \
        core/java/android/hardware/location/IGeofenceHardwareMonitorCallback.aidl \
        core/java/android/hardware/location/IContextHubCallback.aidl \
        core/java/android/hardware/location/IContextHubService.aidl \
+       core/java/android/hardware/radio/IRadioService.aidl \
+       core/java/android/hardware/radio/ITuner.aidl \
+       core/java/android/hardware/radio/ITunerCallback.aidl \
        core/java/android/hardware/soundtrigger/IRecognitionStatusCallback.aidl \
        core/java/android/hardware/usb/IUsbManager.aidl \
        core/java/android/net/ICaptivePortal.aidl \
@@ -277,6 +281,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 \
@@ -483,6 +491,12 @@ LOCAL_SRC_FILES += \
        telecomm/java/com/android/internal/telecom/IInCallService.aidl \
        telecomm/java/com/android/internal/telecom/ITelecomService.aidl \
        telecomm/java/com/android/internal/telecom/RemoteServiceCallback.aidl \
+        telephony/java/android/telephony/mbms/IMbmsDownloadManagerCallback.aidl \
+       telephony/java/android/telephony/mbms/IMbmsStreamingManagerCallback.aidl \
+       telephony/java/android/telephony/mbms/IDownloadCallback.aidl \
+        telephony/java/android/telephony/mbms/IStreamingServiceCallback.aidl \
+       telephony/java/android/telephony/mbms/vendor/IMbmsDownloadService.aidl \
+       telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl \
        telephony/java/com/android/ims/internal/IImsCallSession.aidl \
        telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl \
        telephony/java/com/android/ims/internal/IImsConfig.aidl \
@@ -517,6 +531,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 \
@@ -573,6 +588,7 @@ LOCAL_STATIC_JAVA_LIBRARIES :=                          \
     android.hardware.thermal-V1.0-java-constants         \
     android.hardware.tv.input-V1.0-java-constants        \
     android.hardware.usb-V1.0-java-constants             \
+    android.hardware.usb-V1.1-java-constants             \
     android.hardware.vibrator-V1.0-java-constants        \
 
 # Loaded with System.loadLibrary by android.view.textclassifier
@@ -606,6 +622,13 @@ framework_built := $(call java-lib-deps,framework)
 include $(CLEAR_VARS)
 
 aidl_files := \
+        frameworks/base/telephony/java/android/telephony/mbms/DownloadRequest.aidl \
+        frameworks/base/telephony/java/android/telephony/mbms/DownloadStatus.aidl \
+        frameworks/base/telephony/java/android/telephony/mbms/FileInfo.aidl \
+        frameworks/base/telephony/java/android/telephony/mbms/FileServiceInfo.aidl \
+        frameworks/base/telephony/java/android/telephony/mbms/ServiceInfo.aidl \
+       frameworks/base/telephony/java/android/telephony/mbms/StreamingService.aidl \
+        frameworks/base/telephony/java/android/telephony/mbms/StreamingServiceInfo.aidl \
        frameworks/base/telephony/java/android/telephony/ServiceState.aidl \
        frameworks/base/telephony/java/android/telephony/SubscriptionInfo.aidl \
        frameworks/base/telephony/java/android/telephony/CellInfo.aidl \
@@ -613,6 +636,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 \
@@ -666,6 +691,7 @@ aidl_files := \
        frameworks/base/core/java/android/print/PrinterInfo.aidl \
        frameworks/base/core/java/android/print/PrintJobId.aidl \
        frameworks/base/core/java/android/printservice/recommendation/RecommendationInfo.aidl \
+       frameworks/base/core/java/android/hardware/radio/RadioManager.aidl \
        frameworks/base/core/java/android/hardware/usb/UsbDevice.aidl \
        frameworks/base/core/java/android/hardware/usb/UsbInterface.aidl \
        frameworks/base/core/java/android/hardware/usb/UsbEndpoint.aidl \
@@ -725,6 +751,8 @@ 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 \
@@ -835,7 +863,6 @@ fwbase_dirs_to_document := \
 include libcore/Docs.mk
 
 non_base_dirs := \
-       ../opt/telephony/src/java/android/provider \
        ../opt/telephony/src/java/android/telephony \
        ../opt/telephony/src/java/android/telephony/gsm \
        ../opt/net/voip/src/java/android/net/rtp \