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

Commit 308e25e5 authored by David Su's avatar David Su
Browse files

Formalize WifiManager#requestActivityInfo as @SystemApi 

Rename WifiManager#requestActivityInfo to
getWifiActivityEnergyInfoAsync and convert
ResultReceiver to a formal listener interface.

Bug: 145244073
Test: atest FrameworksWifiApiTests
Change-Id: I7f343c07b63c191082443bd8296a5569fb1c0d49
parent d9fc947a

api/system-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -5481,6 +5481,7 @@ package android.net.wifi { 
    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.READ_WIFI_CREDENTIAL}) public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks();

    method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.SoftApConfiguration getSoftApConfiguration();

    method public int getVerboseLoggingLevel();

    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void getWifiActivityEnergyInfoAsync(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.OnWifiActivityEnergyInfoListener);

    method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.WifiConfiguration getWifiApConfiguration();

    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public int getWifiApState();

    method public boolean isApMacRandomizationSupported();
@@ -5583,6 +5584,10 @@ package android.net.wifi { 
    method public default void select(@NonNull android.net.wifi.WifiConfiguration);

  }













  public static interface WifiManager.OnWifiActivityEnergyInfoListener {













    method public void onWifiActivityEnergyInfo(@Nullable android.net.wifi.WifiActivityEnergyInfo);













  }



























  public static interface WifiManager.OnWifiUsabilityStatsListener {















    method public void onWifiUsabilityStats(int, boolean, @NonNull android.net.wifi.WifiUsabilityStatsEntry);















  }

































wifi/java/android/net/wifi/IOnWifiActivityEnergyInfoListener.aidl
0 → 100644



+33
−0




























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2019 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;



























import android.net.wifi.WifiActivityEnergyInfo;



























/**













 * Interface for Wi-Fi activity energy info listener.













 *













 * @hide













 */













oneway interface IOnWifiActivityEnergyInfoListener













{













    /**













     * Service to manager callback providing current Wi-Fi activity energy info.













     * @param info the Wi-Fi activity energy info













     */













    void onWifiActivityEnergyInfo(in WifiActivityEnergyInfo info);













}
























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



+3
−8




























Original line number
Diff line number
Diff line








@@ -28,12 +28,13 @@ import android.net.wifi.IActionListener;













import android.net.wifi.IDppCallback;















import android.net.wifi.ILocalOnlyHotspotCallback;















import android.net.wifi.INetworkRequestMatchCallback;













import android.net.wifi.IOnWifiActivityEnergyInfoListener;













import android.net.wifi.IOnWifiUsabilityStatsListener;















import android.net.wifi.IScanResultsCallback;















import android.net.wifi.ISoftApCallback;















import android.net.wifi.ISuggestionConnectionStatusListener;















import android.net.wifi.ITrafficStateCallback;















import android.net.wifi.ITxPacketCountListener;













import android.net.wifi.IOnWifiUsabilityStatsListener;















import android.net.wifi.ScanResult;















import android.net.wifi.SoftApConfiguration;















import android.net.wifi.WifiActivityEnergyInfo;









@@ -56,13 +57,7 @@ interface IWifiManager





























    WifiActivityEnergyInfo reportActivityInfo();





























    /**













     * Requests the controller activity info asynchronously.













     * The implementor is expected to reply with the













     * {@link android.net.wifi.WifiActivityEnergyInfo} object placed into the Bundle with the key













     * {@link android.os.BatteryStats#RESULT_RECEIVER_CONTROLLER_KEY}. The result code is ignored.













     */













    oneway void requestActivityInfo(in ResultReceiver result);













    oneway void getWifiActivityEnergyInfoAsync(in IOnWifiActivityEnergyInfoListener listener);































    ParceledListSlice getConfiguredNetworks(String packageName, String featureId);

















































wifi/java/android/net/wifi/WifiManager.java



+76
−0




























Original line number
Diff line number
Diff line








@@ -2388,6 +2388,82 @@ public class WifiManager {













        }















    }





























    /**













     * Interface for Wi-Fi activity energy info listener. Should be implemented by applications and













     * set when calling {@link WifiManager#getWifiActivityEnergyInfoAsync}.













     *













     * @hide













     */













    @SystemApi













    public interface OnWifiActivityEnergyInfoListener {













        /**













         * Called when Wi-Fi activity energy info is available.













         * Note: this listener is triggered at most once for each call to













         * {@link #getWifiActivityEnergyInfoAsync}.













         *













         * @param info the latest {@link WifiActivityEnergyInfo}, or null if unavailable.













         */













        void onWifiActivityEnergyInfo(@Nullable WifiActivityEnergyInfo info);













    }



























    private static class OnWifiActivityEnergyInfoProxy













            extends IOnWifiActivityEnergyInfoListener.Stub {













        private final Object mLock = new Object();













        @Nullable @GuardedBy("mLock") private Executor mExecutor;













        @Nullable @GuardedBy("mLock") private OnWifiActivityEnergyInfoListener mListener;



























        OnWifiActivityEnergyInfoProxy(Executor executor,













                OnWifiActivityEnergyInfoListener listener) {













            mExecutor = executor;













            mListener = listener;













        }



























        @Override













        public void onWifiActivityEnergyInfo(WifiActivityEnergyInfo info) {













            Executor executor;













            OnWifiActivityEnergyInfoListener listener;













            synchronized (mLock) {













                if (mExecutor == null || mListener == null) {













                    return;













                }













                executor = mExecutor;













                listener = mListener;













                // null out to allow garbage collection, prevent triggering listener more than once













                mExecutor = null;













                mListener = null;













            }













            Binder.clearCallingIdentity();













            executor.execute(() -> listener.onWifiActivityEnergyInfo(info));













        }













    }



























    /**













     * Request to get the current {@link WifiActivityEnergyInfo} asynchronously.













     * Note: This method will return null if {@link #isEnhancedPowerReportingSupported()} returns













     * false.













     *













     * @param executor the executor that the listener will be invoked on













     * @param listener the listener that will receive the {@link WifiActivityEnergyInfo} object













     *                 when it becomes available. The listener will be triggered at most once for













     *                 each call to this method.













     *













     * @hide













     */













    @SystemApi













    @RequiresPermission(ACCESS_WIFI_STATE)













    public void getWifiActivityEnergyInfoAsync(













            @NonNull @CallbackExecutor Executor executor,













            @NonNull OnWifiActivityEnergyInfoListener listener) {













        if (executor == null) throw new IllegalArgumentException("executor cannot be null");













        if (listener == null) throw new IllegalArgumentException("listener cannot be null");













        try {













            mService.getWifiActivityEnergyInfoAsync(













                    new OnWifiActivityEnergyInfoProxy(executor, listener));













        } catch (RemoteException e) {













            throw e.rethrowFromSystemServer();













        }













    }





























    /**















     * Request a scan for access points. Returns immediately. The availability















     * of the results is made known later by means of an asynchronous event sent

































wifi/java/com/android/server/wifi/BaseWifiService.java



+6
−1




























Original line number
Diff line number
Diff line








@@ -25,6 +25,7 @@ import android.net.wifi.IActionListener;













import android.net.wifi.IDppCallback;















import android.net.wifi.ILocalOnlyHotspotCallback;















import android.net.wifi.INetworkRequestMatchCallback;













import android.net.wifi.IOnWifiActivityEnergyInfoListener;















import android.net.wifi.IOnWifiUsabilityStatsListener;















import android.net.wifi.IScanResultsCallback;















import android.net.wifi.IScanResultsListener;










@@ -80,11 +81,15 @@ public class BaseWifiService extends IWifiManager.Stub {













        throw new UnsupportedOperationException();















    }





























    @Override















    public void requestActivityInfo(ResultReceiver result) {















        throw new UnsupportedOperationException();















    }





























    @Override













    public void getWifiActivityEnergyInfoAsync(IOnWifiActivityEnergyInfoListener listener) {













        throw new UnsupportedOperationException();













    }





























    @Override















    public ParceledListSlice getConfiguredNetworks(String packageName, String featureId) {















        throw new UnsupportedOperationException();