Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc68043a authored by Baligh Uddin's avatar Baligh Uddin Committed by Automerger Merge Worker
Browse files

Merge "Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin" am: e41cd291

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533852

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief078339fcd28ea8899eceec6ec611429c30a2ae
parents 550acd58 e41cd291
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -1239,6 +1239,7 @@ java_library {
    visibility: [
        "//frameworks/base/wifi",
        "//frameworks/base/services/net",
        "//packages/modules/Wifi/framework",
    ],
}

packages/OsuLogin/Android.bp

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line
android_app {
    name: "OsuLogin",
    defaults: ["wifi-module-sdk-version-defaults"],
    static_libs: ["androidx.legacy_legacy-support-v4"],
    resource_dirs: ["res"],
    srcs: ["src/**/*.java"],
    sdk_version: "system_current",
    certificate: ":com.android.hotspot2.osulogin.certificate",
    apex_available: [
        "com.android.wifi",
        "test_com.android.wifi",
    ],
}

android_app_certificate {
    name: "com.android.hotspot2.osulogin.certificate",
    certificate: "certs/com.android.hotspot2.osulogin"
}
+0 −41
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
 * Copyright (C) 2018 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="com.android.hotspot2.osulogin">
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
    <uses-permission android:name="android.permission.INTERNET"/>

    <application
        android:networkSecurityConfig="@xml/network_security_config"
        android:enabled="true"
        android:label="@string/app_name"
        android:configChanges="keyboardHidden|orientation|screenSize"
        android:supportsRtl="true">
        <activity android:name="com.android.hotspot2.osulogin.OsuLoginActivity"
                  android:label="@string/action_bar_label"
                  android:theme="@style/AppTheme"
                  android:configChanges="keyboardHidden|orientation|screenSize">
            <intent-filter>
                <action android:name="android.net.wifi.action.PASSPOINT_LAUNCH_OSU_VIEW"/>
                <category android:name="android.intent.category.DEFAULT"/>
            </intent-filter>
        </activity>
    </application>
</manifest>

packages/OsuLogin/OWNERS

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line
satk@google.com
etancohen@google.com
−2.32 KiB

File deleted.

Loading