Merge "QS: Update rotation lock icons." into lmp-dev

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

diff --git a/Android.mk b/Android.mk
index a595d88..96b2b17 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -118,7 +118,9 @@ LOCAL_SRC_FILES += \
        core/java/android/content/IIntentReceiver.aidl \
        core/java/android/content/IIntentSender.aidl \
        core/java/android/content/IOnPrimaryClipChangedListener.aidl \
+        core/java/android/content/IPermissionResponseCallback.aidl \
        core/java/android/content/IRestrictionsManager.aidl \
+        core/java/android/content/IRestrictionsProvider.aidl \
        core/java/android/content/ISyncAdapter.aidl \
        core/java/android/content/ISyncContext.aidl \
        core/java/android/content/ISyncServiceAdapter.aidl \
@@ -130,6 +132,7 @@ LOCAL_SRC_FILES += \
        core/java/android/content/pm/IPackageInstallObserver.aidl \
        core/java/android/content/pm/IPackageInstallObserver2.aidl \
        core/java/android/content/pm/IPackageInstaller.aidl \
+       core/java/android/content/pm/IPackageInstallerObserver.aidl \
        core/java/android/content/pm/IPackageInstallerSession.aidl \
        core/java/android/content/pm/IPackageManager.aidl \
        core/java/android/content/pm/IPackageMoveObserver.aidl \
@@ -156,6 +159,9 @@ LOCAL_SRC_FILES += \
        core/java/android/hardware/hdmi/IHdmiVendorCommandListener.aidl \
        core/java/android/hardware/input/IInputManager.aidl \
        core/java/android/hardware/input/IInputDevicesChangedListener.aidl \
+       core/java/android/hardware/location/IActivityRecognitionHardware.aidl \
+       core/java/android/hardware/location/IActivityRecognitionHardwareSink.aidl \
+       core/java/android/hardware/location/IActivityRecognitionHardwareWatcher.aidl \
        core/java/android/hardware/location/IFusedLocationHardware.aidl \
        core/java/android/hardware/location/IFusedLocationHardwareSink.aidl \
        core/java/android/hardware/location/IGeofenceHardware.aidl \
@@ -314,9 +320,12 @@ LOCAL_SRC_FILES += \
        media/java/android/media/IRemoteVolumeObserver.aidl \
        media/java/android/media/IRingtonePlayer.aidl \
        media/java/android/media/IVolumeController.aidl \
-       media/java/android/media/routeprovider/IRouteConnection.aidl \
-       media/java/android/media/routeprovider/IRouteProvider.aidl \
-       media/java/android/media/routeprovider/IRouteProviderCallback.aidl \
+       media/java/android/media/routing/IMediaRouteService.aidl \
+       media/java/android/media/routing/IMediaRouteClientCallback.aidl \
+       media/java/android/media/routing/IMediaRouter.aidl \
+       media/java/android/media/routing/IMediaRouterDelegate.aidl \
+       media/java/android/media/routing/IMediaRouterRoutingCallback.aidl \
+       media/java/android/media/routing/IMediaRouterStateCallback.aidl \
        media/java/android/media/session/IActiveSessionsListener.aidl \
        media/java/android/media/session/ISessionController.aidl \
        media/java/android/media/session/ISessionControllerCallback.aidl \
@@ -343,11 +352,13 @@ LOCAL_SRC_FILES += \
        telecomm/java/com/android/internal/telecomm/RemoteServiceCallback.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 \
        telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl \
        telephony/java/com/android/ims/internal/IImsService.aidl \
        telephony/java/com/android/ims/internal/IImsStreamMediaSession.aidl \
        telephony/java/com/android/ims/internal/IImsUt.aidl \
        telephony/java/com/android/ims/internal/IImsUtListener.aidl \
+       telephony/java/com/android/ims/ImsConfigListener.aidl \
        telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl \
        telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \
        telephony/java/com/android/internal/telephony/ITelephony.aidl \
@@ -519,6 +530,7 @@ aidl_files := \
        frameworks/base/location/java/com/android/internal/location/ProviderRequest.aidl \
        frameworks/base/media/java/android/media/MediaMetadata.aidl \
        frameworks/base/media/java/android/media/Rating.aidl \
+       frameworks/base/media/java/android/media/routing/MediaRouteSelector.aidl \
        frameworks/base/media/java/android/media/session/MediaSession.aidl \
        frameworks/base/media/java/android/media/session/PlaybackState.aidl \
        frameworks/base/telephony/java/android/telephony/ServiceState.aidl \