From 6dcd7688737432bf6f2a2f5657983af07c56ff54 Mon Sep 17 00:00:00 2001 From: David Su Date: Tue, 21 Jan 2020 11:23:00 -0800 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. Bug: 140299412 Test: compiles Change-Id: I4e0dc1119bf2b49865c9b5cdf23c571528228902 --- Android.bp | 1 + wifi/Android.bp | 17 ++++++++++++++++- .../android/net/wifi/ScanResult.aidl | 0 .../android/net/wifi/SoftApCapability.aidl | 0 .../android/net/wifi/SoftApConfiguration.aidl | 0 .../android/net/wifi/SoftApInfo.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 .../wifi/WifiNetworkConnectionStatistics.aidl | 0 .../android/net/wifi/WifiNetworkSuggestion.aidl | 0 .../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 .../wifi/hotspot2/PasspointConfiguration.aidl | 0 .../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 .../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 31 files changed, 17 insertions(+), 1 deletion(-) rename wifi/{java => aidl-export}/android/net/wifi/ScanResult.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/SoftApCapability.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/SoftApConfiguration.aidl (100%) rename wifi/{java => aidl-export}/android/net/wifi/SoftApInfo.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 b30bdaa372469..1865a3d873ca4 100644 --- a/Android.bp +++ b/Android.bp @@ -318,6 +318,7 @@ java_defaults { "rs/java", "sax/java", "telecomm/java", + "wifi/aidl-export", ], }, diff --git a/wifi/Android.bp b/wifi/Android.bp index 099cbff15fb48..8fc8af980f9ec 100644 --- a/wifi/Android.bp +++ b/wifi/Android.bp @@ -12,9 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +filegroup { + name: "framework-wifi-updatable-exported-aidl-sources", + srcs: ["aidl-export/**/*.aidl"], + path: "aidl-export", + visibility: ["//visibility:private"], +} filegroup { - name: "framework-wifi-updatable-sources", + name: "framework-wifi-updatable-java-sources", srcs: [ "java/**/*.java", "java/**/*.aidl", @@ -23,6 +29,15 @@ filegroup { ":framework-wifi-non-updatable-sources" ], path: "java", + visibility: ["//visibility:private"], +} + +filegroup { + name: "framework-wifi-updatable-sources", + srcs: [ + ":framework-wifi-updatable-java-sources", + ":framework-wifi-updatable-exported-aidl-sources", + ], } filegroup { 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/SoftApCapability.aidl b/wifi/aidl-export/android/net/wifi/SoftApCapability.aidl similarity index 100% rename from wifi/java/android/net/wifi/SoftApCapability.aidl rename to wifi/aidl-export/android/net/wifi/SoftApCapability.aidl diff --git a/wifi/java/android/net/wifi/SoftApConfiguration.aidl b/wifi/aidl-export/android/net/wifi/SoftApConfiguration.aidl similarity index 100% rename from wifi/java/android/net/wifi/SoftApConfiguration.aidl rename to wifi/aidl-export/android/net/wifi/SoftApConfiguration.aidl diff --git a/wifi/java/android/net/wifi/SoftApInfo.aidl b/wifi/aidl-export/android/net/wifi/SoftApInfo.aidl similarity index 100% rename from wifi/java/android/net/wifi/SoftApInfo.aidl rename to wifi/aidl-export/android/net/wifi/SoftApInfo.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