From 5da04524ce09ebf43fc065f27d4960473e989489 Mon Sep 17 00:00:00 2001 From: David Su Date: Tue, 29 Dec 2020 04:49:50 +0000 Subject: [PATCH] frameworks/base/wifi: unpack non-updatable/ folder Everything remaining in frameworks/base/wifi is non-updatable. Thus, unpack non-updatable/ folder and move everything under wifi/. Bug: 137323948 Test: presubmit Change-Id: I6e1bd3fe6335b5dbe5f8ffa84a84df6434c95674 Merged-In: I6e1bd3fe6335b5dbe5f8ffa84a84df6434c95674 --- wifi/{non-updatable => }/java/Android.bp | 0 .../java/src/android/net/wifi/SoftApConfToXmlMigrationUtil.java | 0 .../java/src/android/net/wifi/WifiMigration.java | 0 .../java/src/android/net/wifi/WifiNetworkScoreCache.java | 0 .../java/src/android/net/wifi/nl80211/ChannelSettings.java | 0 .../src/android/net/wifi/nl80211/DeviceWiphyCapabilities.java | 0 .../java/src/android/net/wifi/nl80211/HiddenNetwork.java | 0 .../java/src/android/net/wifi/nl80211/NativeScanResult.java | 0 .../java/src/android/net/wifi/nl80211/NativeWifiClient.java | 0 .../java/src/android/net/wifi/nl80211/PnoNetwork.java | 0 .../java/src/android/net/wifi/nl80211/PnoSettings.java | 0 .../java/src/android/net/wifi/nl80211/RadioChainInfo.java | 0 .../java/src/android/net/wifi/nl80211/SingleScanSettings.java | 0 .../java/src/android/net/wifi/nl80211/WifiNl80211Manager.java | 0 wifi/{non-updatable => }/migration_samples/README.txt | 0 .../migration_samples/Shared_WifiConfigStore.xml | 0 .../migration_samples/Shared_WifiConfigStoreSoftAp.xml | 0 .../migration_samples/User_WifiConfigStore.xml | 0 .../migration_samples/User_WifiConfigStoreNetworkSuggestions.xml | 0 wifi/{non-updatable => }/tests/Android.bp | 0 wifi/{non-updatable => }/tests/AndroidManifest.xml | 0 wifi/{non-updatable => }/tests/AndroidTest.xml | 0 wifi/{non-updatable => }/tests/README.md | 0 .../src/android/net/wifi/SoftApConfToXmlMigrationUtilTest.java | 0 .../tests/src/android/net/wifi/WifiNetworkScoreCacheTest.java | 0 .../src/android/net/wifi/nl80211/DeviceWiphyCapabilitiesTest.java | 0 .../tests/src/android/net/wifi/nl80211/NativeScanResultTest.java | 0 .../tests/src/android/net/wifi/nl80211/PnoSettingsTest.java | 0 .../src/android/net/wifi/nl80211/SingleScanSettingsTest.java | 0 .../src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java | 0 30 files changed, 0 insertions(+), 0 deletions(-) rename wifi/{non-updatable => }/java/Android.bp (100%) rename wifi/{non-updatable => }/java/src/android/net/wifi/SoftApConfToXmlMigrationUtil.java (100%) rename wifi/{non-updatable => }/java/src/android/net/wifi/WifiMigration.java (100%) rename wifi/{non-updatable => }/java/src/android/net/wifi/WifiNetworkScoreCache.java (100%) rename wifi/{non-updatable => }/java/src/android/net/wifi/nl80211/ChannelSettings.java (100%) rename wifi/{non-updatable => }/java/src/android/net/wifi/nl80211/DeviceWiphyCapabilities.java (100%) rename wifi/{non-updatable => }/java/src/android/net/wifi/nl80211/HiddenNetwork.java (100%) rename wifi/{non-updatable => }/java/src/android/net/wifi/nl80211/NativeScanResult.java (100%) rename wifi/{non-updatable => }/java/src/android/net/wifi/nl80211/NativeWifiClient.java (100%) rename wifi/{non-updatable => }/java/src/android/net/wifi/nl80211/PnoNetwork.java (100%) rename wifi/{non-updatable => }/java/src/android/net/wifi/nl80211/PnoSettings.java (100%) rename wifi/{non-updatable => }/java/src/android/net/wifi/nl80211/RadioChainInfo.java (100%) rename wifi/{non-updatable => }/java/src/android/net/wifi/nl80211/SingleScanSettings.java (100%) rename wifi/{non-updatable => }/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java (100%) rename wifi/{non-updatable => }/migration_samples/README.txt (100%) rename wifi/{non-updatable => }/migration_samples/Shared_WifiConfigStore.xml (100%) rename wifi/{non-updatable => }/migration_samples/Shared_WifiConfigStoreSoftAp.xml (100%) rename wifi/{non-updatable => }/migration_samples/User_WifiConfigStore.xml (100%) rename wifi/{non-updatable => }/migration_samples/User_WifiConfigStoreNetworkSuggestions.xml (100%) rename wifi/{non-updatable => }/tests/Android.bp (100%) rename wifi/{non-updatable => }/tests/AndroidManifest.xml (100%) rename wifi/{non-updatable => }/tests/AndroidTest.xml (100%) rename wifi/{non-updatable => }/tests/README.md (100%) rename wifi/{non-updatable => }/tests/src/android/net/wifi/SoftApConfToXmlMigrationUtilTest.java (100%) rename wifi/{non-updatable => }/tests/src/android/net/wifi/WifiNetworkScoreCacheTest.java (100%) rename wifi/{non-updatable => }/tests/src/android/net/wifi/nl80211/DeviceWiphyCapabilitiesTest.java (100%) rename wifi/{non-updatable => }/tests/src/android/net/wifi/nl80211/NativeScanResultTest.java (100%) rename wifi/{non-updatable => }/tests/src/android/net/wifi/nl80211/PnoSettingsTest.java (100%) rename wifi/{non-updatable => }/tests/src/android/net/wifi/nl80211/SingleScanSettingsTest.java (100%) rename wifi/{non-updatable => }/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java (100%) diff --git a/wifi/non-updatable/java/Android.bp b/wifi/java/Android.bp similarity index 100% rename from wifi/non-updatable/java/Android.bp rename to wifi/java/Android.bp diff --git a/wifi/non-updatable/java/src/android/net/wifi/SoftApConfToXmlMigrationUtil.java b/wifi/java/src/android/net/wifi/SoftApConfToXmlMigrationUtil.java similarity index 100% rename from wifi/non-updatable/java/src/android/net/wifi/SoftApConfToXmlMigrationUtil.java rename to wifi/java/src/android/net/wifi/SoftApConfToXmlMigrationUtil.java diff --git a/wifi/non-updatable/java/src/android/net/wifi/WifiMigration.java b/wifi/java/src/android/net/wifi/WifiMigration.java similarity index 100% rename from wifi/non-updatable/java/src/android/net/wifi/WifiMigration.java rename to wifi/java/src/android/net/wifi/WifiMigration.java diff --git a/wifi/non-updatable/java/src/android/net/wifi/WifiNetworkScoreCache.java b/wifi/java/src/android/net/wifi/WifiNetworkScoreCache.java similarity index 100% rename from wifi/non-updatable/java/src/android/net/wifi/WifiNetworkScoreCache.java rename to wifi/java/src/android/net/wifi/WifiNetworkScoreCache.java diff --git a/wifi/non-updatable/java/src/android/net/wifi/nl80211/ChannelSettings.java b/wifi/java/src/android/net/wifi/nl80211/ChannelSettings.java similarity index 100% rename from wifi/non-updatable/java/src/android/net/wifi/nl80211/ChannelSettings.java rename to wifi/java/src/android/net/wifi/nl80211/ChannelSettings.java diff --git a/wifi/non-updatable/java/src/android/net/wifi/nl80211/DeviceWiphyCapabilities.java b/wifi/java/src/android/net/wifi/nl80211/DeviceWiphyCapabilities.java similarity index 100% rename from wifi/non-updatable/java/src/android/net/wifi/nl80211/DeviceWiphyCapabilities.java rename to wifi/java/src/android/net/wifi/nl80211/DeviceWiphyCapabilities.java diff --git a/wifi/non-updatable/java/src/android/net/wifi/nl80211/HiddenNetwork.java b/wifi/java/src/android/net/wifi/nl80211/HiddenNetwork.java similarity index 100% rename from wifi/non-updatable/java/src/android/net/wifi/nl80211/HiddenNetwork.java rename to wifi/java/src/android/net/wifi/nl80211/HiddenNetwork.java diff --git a/wifi/non-updatable/java/src/android/net/wifi/nl80211/NativeScanResult.java b/wifi/java/src/android/net/wifi/nl80211/NativeScanResult.java similarity index 100% rename from wifi/non-updatable/java/src/android/net/wifi/nl80211/NativeScanResult.java rename to wifi/java/src/android/net/wifi/nl80211/NativeScanResult.java diff --git a/wifi/non-updatable/java/src/android/net/wifi/nl80211/NativeWifiClient.java b/wifi/java/src/android/net/wifi/nl80211/NativeWifiClient.java similarity index 100% rename from wifi/non-updatable/java/src/android/net/wifi/nl80211/NativeWifiClient.java rename to wifi/java/src/android/net/wifi/nl80211/NativeWifiClient.java diff --git a/wifi/non-updatable/java/src/android/net/wifi/nl80211/PnoNetwork.java b/wifi/java/src/android/net/wifi/nl80211/PnoNetwork.java similarity index 100% rename from wifi/non-updatable/java/src/android/net/wifi/nl80211/PnoNetwork.java rename to wifi/java/src/android/net/wifi/nl80211/PnoNetwork.java diff --git a/wifi/non-updatable/java/src/android/net/wifi/nl80211/PnoSettings.java b/wifi/java/src/android/net/wifi/nl80211/PnoSettings.java similarity index 100% rename from wifi/non-updatable/java/src/android/net/wifi/nl80211/PnoSettings.java rename to wifi/java/src/android/net/wifi/nl80211/PnoSettings.java diff --git a/wifi/non-updatable/java/src/android/net/wifi/nl80211/RadioChainInfo.java b/wifi/java/src/android/net/wifi/nl80211/RadioChainInfo.java similarity index 100% rename from wifi/non-updatable/java/src/android/net/wifi/nl80211/RadioChainInfo.java rename to wifi/java/src/android/net/wifi/nl80211/RadioChainInfo.java diff --git a/wifi/non-updatable/java/src/android/net/wifi/nl80211/SingleScanSettings.java b/wifi/java/src/android/net/wifi/nl80211/SingleScanSettings.java similarity index 100% rename from wifi/non-updatable/java/src/android/net/wifi/nl80211/SingleScanSettings.java rename to wifi/java/src/android/net/wifi/nl80211/SingleScanSettings.java diff --git a/wifi/non-updatable/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java b/wifi/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java similarity index 100% rename from wifi/non-updatable/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java rename to wifi/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java diff --git a/wifi/non-updatable/migration_samples/README.txt b/wifi/migration_samples/README.txt similarity index 100% rename from wifi/non-updatable/migration_samples/README.txt rename to wifi/migration_samples/README.txt diff --git a/wifi/non-updatable/migration_samples/Shared_WifiConfigStore.xml b/wifi/migration_samples/Shared_WifiConfigStore.xml similarity index 100% rename from wifi/non-updatable/migration_samples/Shared_WifiConfigStore.xml rename to wifi/migration_samples/Shared_WifiConfigStore.xml diff --git a/wifi/non-updatable/migration_samples/Shared_WifiConfigStoreSoftAp.xml b/wifi/migration_samples/Shared_WifiConfigStoreSoftAp.xml similarity index 100% rename from wifi/non-updatable/migration_samples/Shared_WifiConfigStoreSoftAp.xml rename to wifi/migration_samples/Shared_WifiConfigStoreSoftAp.xml diff --git a/wifi/non-updatable/migration_samples/User_WifiConfigStore.xml b/wifi/migration_samples/User_WifiConfigStore.xml similarity index 100% rename from wifi/non-updatable/migration_samples/User_WifiConfigStore.xml rename to wifi/migration_samples/User_WifiConfigStore.xml diff --git a/wifi/non-updatable/migration_samples/User_WifiConfigStoreNetworkSuggestions.xml b/wifi/migration_samples/User_WifiConfigStoreNetworkSuggestions.xml similarity index 100% rename from wifi/non-updatable/migration_samples/User_WifiConfigStoreNetworkSuggestions.xml rename to wifi/migration_samples/User_WifiConfigStoreNetworkSuggestions.xml diff --git a/wifi/non-updatable/tests/Android.bp b/wifi/tests/Android.bp similarity index 100% rename from wifi/non-updatable/tests/Android.bp rename to wifi/tests/Android.bp diff --git a/wifi/non-updatable/tests/AndroidManifest.xml b/wifi/tests/AndroidManifest.xml similarity index 100% rename from wifi/non-updatable/tests/AndroidManifest.xml rename to wifi/tests/AndroidManifest.xml diff --git a/wifi/non-updatable/tests/AndroidTest.xml b/wifi/tests/AndroidTest.xml similarity index 100% rename from wifi/non-updatable/tests/AndroidTest.xml rename to wifi/tests/AndroidTest.xml diff --git a/wifi/non-updatable/tests/README.md b/wifi/tests/README.md similarity index 100% rename from wifi/non-updatable/tests/README.md rename to wifi/tests/README.md diff --git a/wifi/non-updatable/tests/src/android/net/wifi/SoftApConfToXmlMigrationUtilTest.java b/wifi/tests/src/android/net/wifi/SoftApConfToXmlMigrationUtilTest.java similarity index 100% rename from wifi/non-updatable/tests/src/android/net/wifi/SoftApConfToXmlMigrationUtilTest.java rename to wifi/tests/src/android/net/wifi/SoftApConfToXmlMigrationUtilTest.java diff --git a/wifi/non-updatable/tests/src/android/net/wifi/WifiNetworkScoreCacheTest.java b/wifi/tests/src/android/net/wifi/WifiNetworkScoreCacheTest.java similarity index 100% rename from wifi/non-updatable/tests/src/android/net/wifi/WifiNetworkScoreCacheTest.java rename to wifi/tests/src/android/net/wifi/WifiNetworkScoreCacheTest.java diff --git a/wifi/non-updatable/tests/src/android/net/wifi/nl80211/DeviceWiphyCapabilitiesTest.java b/wifi/tests/src/android/net/wifi/nl80211/DeviceWiphyCapabilitiesTest.java similarity index 100% rename from wifi/non-updatable/tests/src/android/net/wifi/nl80211/DeviceWiphyCapabilitiesTest.java rename to wifi/tests/src/android/net/wifi/nl80211/DeviceWiphyCapabilitiesTest.java diff --git a/wifi/non-updatable/tests/src/android/net/wifi/nl80211/NativeScanResultTest.java b/wifi/tests/src/android/net/wifi/nl80211/NativeScanResultTest.java similarity index 100% rename from wifi/non-updatable/tests/src/android/net/wifi/nl80211/NativeScanResultTest.java rename to wifi/tests/src/android/net/wifi/nl80211/NativeScanResultTest.java diff --git a/wifi/non-updatable/tests/src/android/net/wifi/nl80211/PnoSettingsTest.java b/wifi/tests/src/android/net/wifi/nl80211/PnoSettingsTest.java similarity index 100% rename from wifi/non-updatable/tests/src/android/net/wifi/nl80211/PnoSettingsTest.java rename to wifi/tests/src/android/net/wifi/nl80211/PnoSettingsTest.java diff --git a/wifi/non-updatable/tests/src/android/net/wifi/nl80211/SingleScanSettingsTest.java b/wifi/tests/src/android/net/wifi/nl80211/SingleScanSettingsTest.java similarity index 100% rename from wifi/non-updatable/tests/src/android/net/wifi/nl80211/SingleScanSettingsTest.java rename to wifi/tests/src/android/net/wifi/nl80211/SingleScanSettingsTest.java diff --git a/wifi/non-updatable/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java b/wifi/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java similarity index 100% rename from wifi/non-updatable/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java rename to wifi/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java