diff options
| author | David Su <dysu@google.com> | 2020-02-19 19:07:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-19 19:07:40 +0000 |
| commit | 1111e361ac482e394647776f4c00e4603c342375 (patch) | |
| tree | e3a32fb479ddd3fc460e6d33370ceed4c9226fc8 | |
| parent | 56471f597e58543ef21c82b10b781b34a6ed5df6 (diff) | |
| parent | 615d3a5612be70a3ddeb1b5ad0fa49c86c465e69 (diff) | |
Merge "Rename OsuLogin package to com.android.hotspot2.osulogin"
| -rw-r--r-- | service/res/values/config.xml | 2 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProvisionerTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/service/res/values/config.xml b/service/res/values/config.xml index 3456ab7cd..3a7c11479 100644 --- a/service/res/values/config.xml +++ b/service/res/values/config.xml @@ -380,5 +380,5 @@ <bool translatable="false" name="config_wifiSaeUpgradeOffloadEnabled">false</bool> <!-- Package name for the OSU Login APK --> - <string translatable="false" name="config_wifiOsuLoginPackage">com.android.hotspot2</string> + <string translatable="false" name="config_wifiOsuLoginPackage">com.android.hotspot2.osulogin</string> </resources> diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProvisionerTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProvisionerTest.java index 00500d691..f234a1ef5 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProvisionerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointProvisionerTest.java @@ -134,7 +134,7 @@ public class PasspointProvisionerTest extends WifiBaseTest { private static final String TEST_BSSID_STRING2 = "11:22:33:44:55:77"; private static final String TEST_SSID3 = "TestSSID3"; private static final String TEST_BSSID_STRING3 = "11:22:33:44:55:88"; - private static final String OSU_APP_PACKAGE = "com.android.hotspot2"; + private static final String OSU_APP_PACKAGE = "com.android.hotspot2.osulogin"; private static final String OSU_APP_NAME = "OsuLogin"; private static final byte[] TEST_OSU_SSID_BYTES = "OSU_SSID".getBytes(StandardCharsets.UTF_8); |