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

Commit 80fb1375 authored by Roshan Pius's avatar Roshan Pius
Browse files

WifiManager: Add callback for traffic poller 

The current mechanism for traffic poller directly exposes the wifi
service's internal message handler to privileged apps. Move away from
this mechanism and expose an API to let apps register for callbacks from
traffic poller. This API uses binder IPC for registration and
invocation of callbacks. Clients are automatically removed on binder
death.
This will also let us mark WifiManager#getWifiMessenger() method
private to prevent any apps from getting access to this internal messenger.

Note: This is based on the existing SoftapCallback registration
mechanism.

Also, fixed a bunch of checkstyle errors that were not caught
previously.

Bug: 27074039
Test: Unit tests
Test: Verified the data indicators on Sysui
Change-Id: I505bd2398552be99ccca7b7d3c31a488aa72af70
parent 4fdb3bc4

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -576,6 +576,7 @@ java_library { 
        "telephony/java/com/android/internal/telephony/euicc/ISetNicknameCallback.aidl",

        "telephony/java/com/android/internal/telephony/euicc/ISwitchToProfileCallback.aidl",

        "wifi/java/android/net/wifi/ISoftApCallback.aidl",

        "wifi/java/android/net/wifi/ITrafficStateCallback.aidl",

        "wifi/java/android/net/wifi/IWifiManager.aidl",

        "wifi/java/android/net/wifi/aware/IWifiAwareDiscoverySessionCallback.aidl",

        "wifi/java/android/net/wifi/aware/IWifiAwareEventCallback.aidl",

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+11 −8
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ 


package com.android.systemui.statusbar.policy;



import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;

import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_IN;

import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_INOUT;

import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_NONE;

import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_OUT;



import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;
@@ -55,7 +61,6 @@ import com.android.systemui.R; 
import com.android.systemui.settings.CurrentUserTracker;

import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;



import com.android.systemui.statusbar.policy.MobileSignalController.MobileState;

import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;
@@ -65,8 +70,6 @@ import java.util.Comparator; 
import java.util.List;

import java.util.Locale;



import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;



/** Platform implementation of the network controller. **/

public class NetworkControllerImpl extends BroadcastReceiver

        implements NetworkController, DemoMode, DataUsageController.NetworkNameProvider,
@@ -849,20 +852,20 @@ public class NetworkControllerImpl extends BroadcastReceiver 
                if (activity != null) {

                    switch (activity) {

                        case "inout":

                            mWifiSignalController.setActivity(WifiManager.DATA_ACTIVITY_INOUT);

                            mWifiSignalController.setActivity(DATA_ACTIVITY_INOUT);

                            break;

                        case "in":

                            mWifiSignalController.setActivity(WifiManager.DATA_ACTIVITY_IN);

                            mWifiSignalController.setActivity(DATA_ACTIVITY_IN);

                            break;

                        case "out":

                            mWifiSignalController.setActivity(WifiManager.DATA_ACTIVITY_OUT);

                            mWifiSignalController.setActivity(DATA_ACTIVITY_OUT);

                            break;

                        default:

                            mWifiSignalController.setActivity(WifiManager.DATA_ACTIVITY_NONE);

                            mWifiSignalController.setActivity(DATA_ACTIVITY_NONE);

                            break;

                    }

                } else {

                    mWifiSignalController.setActivity(WifiManager.DATA_ACTIVITY_NONE);

                    mWifiSignalController.setActivity(DATA_ACTIVITY_NONE);

                }

                String ssid = args.getString("ssid");

                if (ssid != null) {

packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java

+12 −40
Original line number Diff line number Diff line
@@ -15,21 +15,19 @@ 
 */

package com.android.systemui.statusbar.policy;



import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_IN;

import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_INOUT;

import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_OUT;



import android.content.Context;

import android.content.Intent;

import android.net.ConnectivityManager;

import android.net.NetworkCapabilities;

import android.net.NetworkScoreManager;

import android.net.wifi.WifiManager;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.os.Messenger;

import android.text.TextUtils;

import android.util.Log;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.AsyncChannel;

import com.android.settingslib.wifi.WifiStatusTracker;

import com.android.systemui.R;

import com.android.systemui.statusbar.policy.NetworkController.IconState;
@@ -37,10 +35,8 @@ import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; 


import java.util.Objects;





public class WifiSignalController extends

        SignalController<WifiSignalController.WifiState, SignalController.IconGroup> {

    private final AsyncChannel mWifiChannel;

    private final boolean mHasMobileData;

    private final WifiStatusTracker mWifiTracker;
@@ -57,12 +53,7 @@ public class WifiSignalController extends 
                connectivityManager, this::handleStatusUpdated);

        mWifiTracker.setListening(true);

        mHasMobileData = hasMobileData;

        Handler handler = new WifiHandler(Looper.getMainLooper());

        mWifiChannel = new AsyncChannel();

        Messenger wifiMessenger = wifiManager.getWifiServiceMessenger();

        if (wifiMessenger != null) {

            mWifiChannel.connect(context, handler, wifiMessenger);

        }

        wifiManager.registerTrafficStateCallback(new WifiTrafficStateCallback(),  null);

        // WiFi only has one state.

        mCurrentState.iconGroup = mLastState.iconGroup = new IconGroup(

                "Wi-Fi Icons",
@@ -124,39 +115,20 @@ public class WifiSignalController extends 


    @VisibleForTesting

    void setActivity(int wifiActivity) {

        mCurrentState.activityIn = wifiActivity == WifiManager.DATA_ACTIVITY_INOUT

                || wifiActivity == WifiManager.DATA_ACTIVITY_IN;

        mCurrentState.activityOut = wifiActivity == WifiManager.DATA_ACTIVITY_INOUT

                || wifiActivity == WifiManager.DATA_ACTIVITY_OUT;

        mCurrentState.activityIn = wifiActivity == DATA_ACTIVITY_INOUT

                || wifiActivity == DATA_ACTIVITY_IN;

        mCurrentState.activityOut = wifiActivity == DATA_ACTIVITY_INOUT

                || wifiActivity == DATA_ACTIVITY_OUT;

        notifyListenersIfNecessary();

    }



    /**

     * Handler to receive the data activity on wifi.

     */

    private class WifiHandler extends Handler {

        WifiHandler(Looper looper) {

            super(looper);

        }



    private class WifiTrafficStateCallback implements WifiManager.TrafficStateCallback {

        @Override

        public void handleMessage(Message msg) {

            switch (msg.what) {

                case AsyncChannel.CMD_CHANNEL_HALF_CONNECTED:

                    if (msg.arg1 == AsyncChannel.STATUS_SUCCESSFUL) {

                        mWifiChannel.sendMessage(Message.obtain(this,

                                AsyncChannel.CMD_CHANNEL_FULL_CONNECTION));

                    } else {

                        Log.e(mTag, "Failed to connect to wifi");

                    }

                    break;

                case WifiManager.DATA_ACTIVITY_NOTIFICATION:

                    setActivity(msg.arg1);

                    break;

                default:

                    // Ignore

                    break;

            }

        public void onStateChanged(int state) {

            setActivity(state);

        }

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java

+5 −5
Original line number Diff line number Diff line
@@ -87,15 +87,15 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest { 
                WifiIcons.QS_WIFI_SIGNAL_STRENGTH[1][testLevel], testSsid);



        // Set to different activity state first to ensure a callback happens.

        setWifiActivity(WifiManager.DATA_ACTIVITY_IN);

        setWifiActivity(WifiManager.TrafficStateCallback.DATA_ACTIVITY_IN);



        setWifiActivity(WifiManager.DATA_ACTIVITY_NONE);

        setWifiActivity(WifiManager.TrafficStateCallback.DATA_ACTIVITY_NONE);

        verifyLastQsDataDirection(false, false);

        setWifiActivity(WifiManager.DATA_ACTIVITY_IN);

        setWifiActivity(WifiManager.TrafficStateCallback.DATA_ACTIVITY_IN);

        verifyLastQsDataDirection(true, false);

        setWifiActivity(WifiManager.DATA_ACTIVITY_OUT);

        setWifiActivity(WifiManager.TrafficStateCallback.DATA_ACTIVITY_OUT);

        verifyLastQsDataDirection(false, true);

        setWifiActivity(WifiManager.DATA_ACTIVITY_INOUT);

        setWifiActivity(WifiManager.TrafficStateCallback.DATA_ACTIVITY_INOUT);

        verifyLastQsDataDirection(true, true);

    }

wifi/java/android/net/wifi/ITrafficStateCallback.aidl

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * 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.

 */



package android.net.wifi;



/**

 * Interface for Traffic state callback.

 *

 * @hide

 */

oneway interface ITrafficStateCallback

{

   /**

    * Callback invoked to inform clients about the current traffic state.

    *

    * @param state One of the values: {@link #DATA_ACTIVITY_NONE}, {@link #DATA_ACTIVITY_IN},

    * {@link #DATA_ACTIVITY_OUT} & {@link #DATA_ACTIVITY_INOUT}.

    * @hide

    */

   void onStateChanged(int state);

}