Merge "Add APIs to EuiccCardManager and EuiccCardController." am: 0797f4be58 am:...

am: 56a8d9ad4f

Change-Id: I02779540eaaf2ad934f5190c88296547c430df1a

diff --cc Android.bp
index 1793dd5,56962b2..75dfbb5
--- 1/Android.bp
--- 2/Android.bp
+++ b/Android.bp
@@@ -526,15 -517,21 +528,25 @@@ java_library 
          "telephony/java/com/android/internal/telephony/euicc/IEuiccCardController.aidl",
          "telephony/java/com/android/internal/telephony/euicc/IEuiccController.aidl",
          "telephony/java/com/android/internal/telephony/euicc/IGetAllProfilesCallback.aidl",
+         "telephony/java/com/android/internal/telephony/euicc/IGetEuiccChallengeCallback.aidl",
+         "telephony/java/com/android/internal/telephony/euicc/IGetEuiccInfo1Callback.aidl",
+         "telephony/java/com/android/internal/telephony/euicc/IGetEuiccInfo2Callback.aidl",
+         "telephony/java/com/android/internal/telephony/euicc/IGetRulesAuthTableCallback.aidl",
+         "telephony/java/com/android/internal/telephony/euicc/IListNotificationsCallback.aidl",
+         "telephony/java/com/android/internal/telephony/euicc/ILoadBoundProfilePackageCallback.aidl",
+         "telephony/java/com/android/internal/telephony/euicc/IPrepareDownloadCallback.aidl",
+         "telephony/java/com/android/internal/telephony/euicc/IRemoveNotificationFromListCallback.aidl",
+         "telephony/java/com/android/internal/telephony/euicc/IRetrieveNotificationCallback.aidl",
+         "telephony/java/com/android/internal/telephony/euicc/IRetrieveNotificationListCallback.aidl",
          "wifi/java/android/net/wifi/IWifiManager.aidl",
 +        "wifi/java/android/net/wifi/aware/IWifiAwareDiscoverySessionCallback.aidl",
          "wifi/java/android/net/wifi/aware/IWifiAwareEventCallback.aidl",
 +        "wifi/java/android/net/wifi/aware/IWifiAwareMacAddressProvider.aidl",
          "wifi/java/android/net/wifi/aware/IWifiAwareManager.aidl",
 -        "wifi/java/android/net/wifi/aware/IWifiAwareDiscoverySessionCallback.aidl",
          "wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl",
 +        "wifi/java/android/net/wifi/rtt/IRttCallback.aidl",
 +        "wifi/java/android/net/wifi/rtt/IWifiRttManager.aidl",
 +        "wifi/java/android/net/wifi/hotspot2/IProvisioningCallback.aidl",
          "wifi/java/android/net/wifi/IWifiScanner.aidl",
          "wifi/java/android/net/wifi/IRttManager.aidl",
          "packages/services/PacProcessor/com/android/net/IProxyService.aidl",