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

Commit e21b5641 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge "Kill the NetworkInfo(int type) constructor. IT'S A TRAP!" into lmp-dev

parents f0e57e10 17e7e975

core/java/android/net/NetworkInfo.java

+0 −8
Original line number Diff line number Diff line
@@ -127,14 +127,6 @@ public class NetworkInfo implements Parcelable { 
     */

    private boolean mIsAvailable;



    /**

     * @param type network type

     * @deprecated

     * @hide because this constructor was only meant for internal use (and

     * has now been superseded by the package-private constructor below).

     */

    public NetworkInfo(int type) {}



    /**

     * @hide

     */

services/core/java/com/android/server/ConnectivityService.java

+2 −1
Original line number Diff line number Diff line
@@ -4816,7 +4816,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
            result.setType(networkType);

            return result;

        } else {

            NetworkInfo result = new NetworkInfo(networkType);

            NetworkInfo result = new NetworkInfo(

                    networkType, 0, ConnectivityManager.getNetworkTypeName(networkType), "");

            result.setDetailedState(NetworkInfo.DetailedState.DISCONNECTED, null, null);

            return result;

        }