From 859af50899af7e2a99fdf021344b8f66514c7d5a Mon Sep 17 00:00:00 2001 From: Xiao Ma Date: Fri, 31 Jan 2020 12:40:12 +0900 Subject: [PATCH] Export Wifi Parcelables AIDLs from framework.jar Add Wifi public/@SystemApi Parcelable AIDLs to framework.jar AIDL exports so that they can be referenced outside the Wifi module. Create a new folder "aidl-export" to separate the AIDLs we want to export to allow external callers to reference in their AIDL. Private AIDLs remain in the "java" folder. most of modifications cherry-pick from internal master (ag/10139892), but slight change for Android.bp to be able to compile in aosp build system. keeping the same aidl path as master to find the correct path when importing ScanResult from wifi. Bug: 140299412 Bug: 137835398 Test: atest FrameworksWifiTests Merged-In: I4e0dc1119bf2b49865c9b5cdf23c571528228902 Change-Id: Idaae4f365e4efaead023ee175391a9e9432a6e00 --- Android.bp | 10 ++++++++++ .../android/net/wifi/ScanResult.aidl | 0 .../android/net/wifi/WifiClient.aidl | 0 .../android/net/wifi/WifiConfiguration.aidl | 0 .../android/net/wifi/WifiEnterpriseConfig.aidl | 0 .../android/net/wifi/WifiInfo.aidl | 0 .../net/wifi/WifiNetworkConnectionStatistics.aidl | 0 .../android/net/wifi/WifiNetworkSuggestion.aidl | 0 .../android/net/wifi/WifiUsabilityStatsEntry.aidl | 0 .../android/net/wifi/WpsInfo.aidl | 0 .../android/net/wifi/aware/Characteristics.aidl | 0 .../android/net/wifi/aware/PublishConfig.aidl | 0 .../android/net/wifi/aware/SubscribeConfig.aidl | 0 .../android/net/wifi/hotspot2/OsuProvider.aidl | 0 .../net/wifi/hotspot2/PasspointConfiguration.aidl | 0 .../android/net/wifi/hotspot2/pps/Credential.aidl | 0 .../android/net/wifi/hotspot2/pps/HomeSp.aidl | 0 .../android/net/wifi/p2p/WifiP2pConfig.aidl | 0 .../android/net/wifi/p2p/WifiP2pDevice.aidl | 0 .../android/net/wifi/p2p/WifiP2pDeviceList.aidl | 0 .../android/net/wifi/p2p/WifiP2pGroup.aidl | 0 .../android/net/wifi/p2p/WifiP2pInfo.aidl | 0 .../android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl | 0 .../net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl | 0 .../android/net/wifi/rtt/RangingRequest.aidl | 0 .../android/net/wifi/rtt/RangingResult.aidl | 0 .../android/net/wifi/rtt/ResponderConfig.aidl | 0 27 files changed, 10 insertions(+) rename wifi/{java => aidl-export}/android/net/wifi/ScanResult.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/WifiClient.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/WifiConfiguration.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/WifiEnterpriseConfig.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/WifiInfo.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/WifiNetworkConnectionStatistics.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/WifiNetworkSuggestion.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/WifiUsabilityStatsEntry.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/WpsInfo.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/aware/Characteristics.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/aware/PublishConfig.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/aware/SubscribeConfig.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/hotspot2/OsuProvider.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/hotspot2/PasspointConfiguration.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/hotspot2/pps/Credential.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/hotspot2/pps/HomeSp.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/p2p/WifiP2pConfig.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/p2p/WifiP2pDevice.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/p2p/WifiP2pDeviceList.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/p2p/WifiP2pGroup.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/p2p/WifiP2pInfo.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/rtt/RangingRequest.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/rtt/RangingResult.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/rtt/ResponderConfig.aidl (100%) diff --git a/Android.bp b/Android.bp index feaafa3f0ea3f..e54de2dec7d95 100644 --- a/Android.bp +++ b/Android.bp @@ -217,6 +217,14 @@ filegroup { path: "wifi/java", } +filegroup { + name: "framework-wifi-updatable-exported-aidl-sources", + srcs: [ + "wifi/aidl-export/**/*.aidl", + ], + path: "wifi/aidl-export", +} + filegroup { name: "framework-non-updatable-sources", srcs: [ @@ -279,6 +287,7 @@ filegroup { srcs: [ ":framework-sdkextensions-sources", ":framework-tethering-srcs", + ":framework-wifi-updatable-exported-aidl-sources", ":updatable-media-srcs", ":ike-srcs", ] @@ -316,6 +325,7 @@ java_defaults { "telecomm/java", "telephony/java", "wifi/java", + "wifi/aidl-export", ], }, } diff --git a/wifi/java/android/net/wifi/ScanResult.aidl b/wifi/aidl-export/android/net/wifi/ScanResult.aidl similarity index 100% rename from wifi/java/android/net/wifi/ScanResult.aidl rename to wifi/aidl-export/android/net/wifi/ScanResult.aidl diff --git a/wifi/java/android/net/wifi/WifiClient.aidl b/wifi/aidl-export/android/net/wifi/WifiClient.aidl similarity index 100% rename from wifi/java/android/net/wifi/WifiClient.aidl rename to wifi/aidl-export/android/net/wifi/WifiClient.aidl diff --git a/wifi/java/android/net/wifi/WifiConfiguration.aidl b/wifi/aidl-export/android/net/wifi/WifiConfiguration.aidl similarity index 100% rename from wifi/java/android/net/wifi/WifiConfiguration.aidl rename to wifi/aidl-export/android/net/wifi/WifiConfiguration.aidl diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.aidl b/wifi/aidl-export/android/net/wifi/WifiEnterpriseConfig.aidl similarity index 100% rename from wifi/java/android/net/wifi/WifiEnterpriseConfig.aidl rename to wifi/aidl-export/android/net/wifi/WifiEnterpriseConfig.aidl diff --git a/wifi/java/android/net/wifi/WifiInfo.aidl b/wifi/aidl-export/android/net/wifi/WifiInfo.aidl similarity index 100% rename from wifi/java/android/net/wifi/WifiInfo.aidl rename to wifi/aidl-export/android/net/wifi/WifiInfo.aidl diff --git a/wifi/java/android/net/wifi/WifiNetworkConnectionStatistics.aidl b/wifi/aidl-export/android/net/wifi/WifiNetworkConnectionStatistics.aidl similarity index 100% rename from wifi/java/android/net/wifi/WifiNetworkConnectionStatistics.aidl rename to wifi/aidl-export/android/net/wifi/WifiNetworkConnectionStatistics.aidl diff --git a/wifi/java/android/net/wifi/WifiNetworkSuggestion.aidl b/wifi/aidl-export/android/net/wifi/WifiNetworkSuggestion.aidl similarity index 100% rename from wifi/java/android/net/wifi/WifiNetworkSuggestion.aidl rename to wifi/aidl-export/android/net/wifi/WifiNetworkSuggestion.aidl diff --git a/wifi/java/android/net/wifi/WifiUsabilityStatsEntry.aidl b/wifi/aidl-export/android/net/wifi/WifiUsabilityStatsEntry.aidl similarity index 100% rename from wifi/java/android/net/wifi/WifiUsabilityStatsEntry.aidl rename to wifi/aidl-export/android/net/wifi/WifiUsabilityStatsEntry.aidl diff --git a/wifi/java/android/net/wifi/WpsInfo.aidl b/wifi/aidl-export/android/net/wifi/WpsInfo.aidl similarity index 100% rename from wifi/java/android/net/wifi/WpsInfo.aidl rename to wifi/aidl-export/android/net/wifi/WpsInfo.aidl diff --git a/wifi/java/android/net/wifi/aware/Characteristics.aidl b/wifi/aidl-export/android/net/wifi/aware/Characteristics.aidl similarity index 100% rename from wifi/java/android/net/wifi/aware/Characteristics.aidl rename to wifi/aidl-export/android/net/wifi/aware/Characteristics.aidl diff --git a/wifi/java/android/net/wifi/aware/PublishConfig.aidl b/wifi/aidl-export/android/net/wifi/aware/PublishConfig.aidl similarity index 100% rename from wifi/java/android/net/wifi/aware/PublishConfig.aidl rename to wifi/aidl-export/android/net/wifi/aware/PublishConfig.aidl diff --git a/wifi/java/android/net/wifi/aware/SubscribeConfig.aidl b/wifi/aidl-export/android/net/wifi/aware/SubscribeConfig.aidl similarity index 100% rename from wifi/java/android/net/wifi/aware/SubscribeConfig.aidl rename to wifi/aidl-export/android/net/wifi/aware/SubscribeConfig.aidl diff --git a/wifi/java/android/net/wifi/hotspot2/OsuProvider.aidl b/wifi/aidl-export/android/net/wifi/hotspot2/OsuProvider.aidl similarity index 100% rename from wifi/java/android/net/wifi/hotspot2/OsuProvider.aidl rename to wifi/aidl-export/android/net/wifi/hotspot2/OsuProvider.aidl diff --git a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.aidl b/wifi/aidl-export/android/net/wifi/hotspot2/PasspointConfiguration.aidl similarity index 100% rename from wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.aidl rename to wifi/aidl-export/android/net/wifi/hotspot2/PasspointConfiguration.aidl diff --git a/wifi/java/android/net/wifi/hotspot2/pps/Credential.aidl b/wifi/aidl-export/android/net/wifi/hotspot2/pps/Credential.aidl similarity index 100% rename from wifi/java/android/net/wifi/hotspot2/pps/Credential.aidl rename to wifi/aidl-export/android/net/wifi/hotspot2/pps/Credential.aidl diff --git a/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.aidl b/wifi/aidl-export/android/net/wifi/hotspot2/pps/HomeSp.aidl similarity index 100% rename from wifi/java/android/net/wifi/hotspot2/pps/HomeSp.aidl rename to wifi/aidl-export/android/net/wifi/hotspot2/pps/HomeSp.aidl diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pConfig.aidl b/wifi/aidl-export/android/net/wifi/p2p/WifiP2pConfig.aidl similarity index 100% rename from wifi/java/android/net/wifi/p2p/WifiP2pConfig.aidl rename to wifi/aidl-export/android/net/wifi/p2p/WifiP2pConfig.aidl diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pDevice.aidl b/wifi/aidl-export/android/net/wifi/p2p/WifiP2pDevice.aidl similarity index 100% rename from wifi/java/android/net/wifi/p2p/WifiP2pDevice.aidl rename to wifi/aidl-export/android/net/wifi/p2p/WifiP2pDevice.aidl diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.aidl b/wifi/aidl-export/android/net/wifi/p2p/WifiP2pDeviceList.aidl similarity index 100% rename from wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.aidl rename to wifi/aidl-export/android/net/wifi/p2p/WifiP2pDeviceList.aidl diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pGroup.aidl b/wifi/aidl-export/android/net/wifi/p2p/WifiP2pGroup.aidl similarity index 100% rename from wifi/java/android/net/wifi/p2p/WifiP2pGroup.aidl rename to wifi/aidl-export/android/net/wifi/p2p/WifiP2pGroup.aidl diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pInfo.aidl b/wifi/aidl-export/android/net/wifi/p2p/WifiP2pInfo.aidl similarity index 100% rename from wifi/java/android/net/wifi/p2p/WifiP2pInfo.aidl rename to wifi/aidl-export/android/net/wifi/p2p/WifiP2pInfo.aidl diff --git a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl b/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl similarity index 100% rename from wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl rename to wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl diff --git a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl b/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl similarity index 100% rename from wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl rename to wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl diff --git a/wifi/java/android/net/wifi/rtt/RangingRequest.aidl b/wifi/aidl-export/android/net/wifi/rtt/RangingRequest.aidl similarity index 100% rename from wifi/java/android/net/wifi/rtt/RangingRequest.aidl rename to wifi/aidl-export/android/net/wifi/rtt/RangingRequest.aidl diff --git a/wifi/java/android/net/wifi/rtt/RangingResult.aidl b/wifi/aidl-export/android/net/wifi/rtt/RangingResult.aidl similarity index 100% rename from wifi/java/android/net/wifi/rtt/RangingResult.aidl rename to wifi/aidl-export/android/net/wifi/rtt/RangingResult.aidl diff --git a/wifi/java/android/net/wifi/rtt/ResponderConfig.aidl b/wifi/aidl-export/android/net/wifi/rtt/ResponderConfig.aidl similarity index 100% rename from wifi/java/android/net/wifi/rtt/ResponderConfig.aidl rename to wifi/aidl-export/android/net/wifi/rtt/ResponderConfig.aidl