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

Commit 82c8b7ed authored by Vinit Deshpande's avatar Vinit Deshpande Committed by Android Partner Code Review
Browse files

Merge "Remove older passpoint code that we never made to work" into mm-wireless-dev

parents 45836d13 cb90cfbe

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -409,7 +409,6 @@ LOCAL_SRC_FILES += \ 
	telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \

	telephony/java/com/android/internal/telephony/IWapPushManager.aidl \

	wifi/java/android/net/wifi/IWifiManager.aidl \

	wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl \

	wifi/java/android/net/wifi/nan/IWifiNanEventListener.aidl \

	wifi/java/android/net/wifi/nan/IWifiNanManager.aidl \

	wifi/java/android/net/wifi/nan/IWifiNanSessionListener.aidl \

core/java/android/app/SystemServiceRegistry.java

+0 −11
Original line number Diff line number Diff line
@@ -82,8 +82,6 @@ import android.net.wifi.nan.IWifiNanManager; 
import android.net.wifi.nan.WifiNanManager;

import android.net.wifi.p2p.IWifiP2pManager;

import android.net.wifi.p2p.WifiP2pManager;

import android.net.wifi.passpoint.IWifiPasspointManager;

import android.net.wifi.passpoint.WifiPasspointManager;

import android.nfc.NfcManager;

import android.os.BatteryManager;

import android.os.DropBoxManager;
@@ -483,15 +481,6 @@ final class SystemServiceRegistry { 
                return new WifiManager(ctx.getOuterContext(), service);

            }});



        registerService(Context.WIFI_PASSPOINT_SERVICE, WifiPasspointManager.class,

                new CachedServiceFetcher<WifiPasspointManager>() {

            @Override

            public WifiPasspointManager createService(ContextImpl ctx) {

                IBinder b = ServiceManager.getService(Context.WIFI_PASSPOINT_SERVICE);

                IWifiPasspointManager service = IWifiPasspointManager.Stub.asInterface(b);

                return new WifiPasspointManager(ctx.getOuterContext(), service);

            }});



        registerService(Context.WIFI_P2P_SERVICE, WifiP2pManager.class,

                new StaticServiceFetcher<WifiP2pManager>() {

            @Override

core/java/android/content/Context.java

+0 −12
Original line number Diff line number Diff line
@@ -2461,7 +2461,6 @@ public abstract class Context { 
            //@hide: NETWORK_POLICY_SERVICE,

            WIFI_SERVICE,

            WIFI_NAN_SERVICE,

            WIFI_PASSPOINT_SERVICE,

            WIFI_P2P_SERVICE,

            WIFI_SCANNING_SERVICE,

            //@hide: WIFI_RTT_SERVICE,
@@ -2901,17 +2900,6 @@ public abstract class Context { 
     */

    public static final String WIFI_SERVICE = "wifi";



    /**

     * Use with {@link #getSystemService} to retrieve a {@link

     * android.net.wifi.passpoint.WifiPasspointManager} for handling management of

     * Wi-Fi passpoint access.

     *

     * @see #getSystemService

     * @see android.net.wifi.passpoint.WifiPasspointManager

     * @hide

     */

    public static final String WIFI_PASSPOINT_SERVICE = "wifipasspoint";



    /**

     * Use with {@link #getSystemService} to retrieve a {@link

     * android.net.wifi.p2p.WifiP2pManager} for handling management of

wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
/**

 * Copyright (c) 2014, 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.

 */



package android.net.wifi.passpoint;



import android.net.wifi.ScanResult;

import android.net.wifi.passpoint.WifiPasspointPolicy;

import android.net.wifi.passpoint.WifiPasspointCredential;

import android.os.Messenger;



/**

 * Interface that allows controlling and querying Wifi Passpoint connectivity.

 *

 * {@hide}

 */

interface IWifiPasspointManager

{

    Messenger getMessenger();



    int getPasspointState();



    List<WifiPasspointPolicy> requestCredentialMatch(in List<ScanResult> requested);



    List<WifiPasspointCredential> getCredentials();



    boolean addCredential(in WifiPasspointCredential cred);



    boolean updateCredential(in WifiPasspointCredential cred);



    boolean removeCredential(in WifiPasspointCredential cred);

}

wifi/java/android/net/wifi/passpoint/WifiPasspointCredential.aidl

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/**

 * Copyright (c) 2014, 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.

 */



package android.net.wifi.passpoint;



parcelable WifiPasspointCredential;