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

Commit b021d2a8 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android-framework.lnx.2.0-00016. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1077321   I535c0372447abcc4f189132f57899602b23e8cbb   Update the tether apn data for TIM-IT.
1072247   I254312b5256413f1a4e9ca8609db15cd25bfab94   Fonts: Add support for Reverie font render engine
1064317   I459b3dee5e679432595f97a55ce7b72c4c3777d8   Bluetooth: DUT discovery the correct adapter name
1069247   Idc13d90bfb89a20144f1acfbf9f6277f4f59c348   Add PackageInstaller to power_off_alarm_apps
1039373 1082927   Icef46c725286655c42050ca4fa4ac45889284b82   Add a new feature for recording data usage of video call
1078404   I87bc46fe65b48421ecf3c09eac99ece935aa9747   SystemUI: always hide roaming indicator
1072094   I9d375f5878d10c28280c1339d8a21f85f3e2e159   SystemUI: Add Missing 4G+ Icons
1073082   Ib4a4b35316b4a5f28964b3b5f3a201042b33f192   Wifi: Introduce Intent to inform Wifi sub system restart
1068718   I4e3523bb9b1b704ae3b341fbc9303dd8d6c428ae   server: Fix static code Analyzer issues
1073039   I037c6b757f7b65a1cddb6b7feeb9c78be1a15164   SystemUI: Support forbidden and greyed data icons
1069980   I635421440d262a7d51d5955c15343d65dc1ae32c   Bluetooth: Handle user switch with new states
1061535   I8ceda470015c07436fdc77730a4811d901cb6825   SOFTAP: implement SOFTAP new requirement in framework.
1066713   Ic9fc0f0f993a1bd1aee9ca2a74107f3e23b24b3b   SIM card page and cellular network settings page are not

Change-Id: Iee6f516a1ed655f2754e4d2d109acda48557c514
CRs-Fixed: 1078404, 1069980, 1039373, 1082927, 1073039, 1064317, 1066713, 1072247, 1072094, 1061535, 1068718, 1069247, 1077321, 1073082
parents eebb3a7b 544a44bd

core/java/android/net/ConnectivityManager.java

+25 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.app.PendingIntent; 
import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.net.wifi.WifiDevice;

import android.os.Binder;

import android.os.Build.VERSION_CODES;

import android.os.Bundle;
@@ -59,6 +60,7 @@ import java.lang.annotation.RetentionPolicy; 
import java.net.InetAddress;

import java.util.HashMap;

import java.util.concurrent.atomic.AtomicInteger;

import java.util.List;



/**

 * Class that answers queries about the state of network connectivity. It also
@@ -296,6 +298,15 @@ public class ConnectivityManager { 
    public static final String ACTION_TETHER_STATE_CHANGED =

            "android.net.conn.TETHER_STATE_CHANGED";



    /**

     * Broadcast intent action indicating that a Station is connected

     * or disconnected.

     *

     * @hide

     */

    public static final String TETHER_CONNECT_STATE_CHANGED =

        "codeaurora.net.conn.TETHER_CONNECT_STATE_CHANGED";



    /**

     * @hide

     * gives a String[] listing all the interfaces configured for
@@ -2142,6 +2153,20 @@ public class ConnectivityManager { 
        }

    }



    /**

     * Get the list of Stations connected to Hotspot.

     *

     * @return a list of {@link WifiDevice} objects.

     * {@hide}

     */

    public List<WifiDevice> getTetherConnectedSta() {

        try {

            return mService.getTetherConnectedSta();

        } catch (RemoteException e) {

            return null;

        }

    }



    /** {@hide} */

    public static final int TETHER_ERROR_NO_ERROR           = 0;

    /** {@hide} */

core/java/android/net/IConnectivityManager.aidl

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.net.NetworkQuotaInfo; 
import android.net.NetworkRequest;

import android.net.NetworkState;

import android.net.ProxyInfo;

import android.net.wifi.WifiDevice;

import android.os.IBinder;

import android.os.Messenger;

import android.os.ParcelFileDescriptor;
@@ -36,6 +37,8 @@ import com.android.internal.net.VpnConfig; 
import com.android.internal.net.VpnInfo;

import com.android.internal.net.VpnProfile;



import java.util.List;



/**

 * Interface that answers queries about, and allows changing, the

 * state of network connectivity.
@@ -97,6 +100,8 @@ interface IConnectivityManager 


    int setUsbTethering(boolean enable);



    List<WifiDevice> getTetherConnectedSta();



    void reportInetCondition(int networkType, int percentage);



    void reportNetworkConnectivity(in Network network, boolean hasConnectivity);

core/java/android/net/INetworkManagementEventObserver.aidl

+7 −0
Original line number Diff line number Diff line
@@ -91,6 +91,13 @@ interface INetworkManagementEventObserver { 
     */

    void interfaceClassDataActivityChanged(String label, boolean active, long tsNanos);



    /**

     * Message is received from network interface.

     *

     * @param message The message

     */

    void interfaceMessageRecevied(String message);



    /**

     * Information about available DNS servers has been received.

     *

core/java/android/net/INetworkStatsService.aidl

+2 −0
Original line number Diff line number Diff line
@@ -67,4 +67,6 @@ interface INetworkStatsService { 
    /** Unregisters a callback on data usage. */

    void unregisterUsageRequest(in DataUsageRequest request);



    /** record video call data usage. */

    void recordVideoCallData(String iface, int ifaceType, long rxBytes, long txBytes);

}

core/java/android/net/NetworkIdentity.java

+5 −1
Original line number Diff line number Diff line
@@ -182,7 +182,11 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { 
            roaming = state.networkInfo.isRoaming();



            metered = !state.networkCapabilities.hasCapability(

                    NetworkCapabilities.NET_CAPABILITY_NOT_METERED);

                    NetworkCapabilities.NET_CAPABILITY_NOT_METERED)

                    || (context.getResources().getBoolean(

                    com.android.internal.R.bool.config_video_call_datausage_enable)

                    && state.networkCapabilities.hasCapability(

                    NetworkCapabilities.NET_CAPABILITY_IMS));



        } else if (type == TYPE_WIFI) {

            if (state.networkId != null) {