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

Commit b10249d6 authored by Christopher Wiley's avatar Christopher Wiley Committed by Mitchell Wills
Browse files

Fix some trivial warnings in WifiP2pDevice.java 

Add some missing @Override annotations, and mark some constants
as unused.

Bug: 28799169
Change-Id: I1ddef87ecb089b62e299544ae94a21d10ef42d98
Test: Compiles.
(cherry picked from commit b41e74f4)
parent 447b0323

wifi/java/android/net/wifi/p2p/WifiP2pDevice.java

+14 −0
Original line number Original line Diff line number Diff line
@@ -66,19 +66,28 @@ public class WifiP2pDevice implements Parcelable { 




    /* Device Capability bitmap */

    /* Device Capability bitmap */

    private static final int DEVICE_CAPAB_SERVICE_DISCOVERY         = 1;

    private static final int DEVICE_CAPAB_SERVICE_DISCOVERY         = 1;

    @SuppressWarnings("unused")

    private static final int DEVICE_CAPAB_CLIENT_DISCOVERABILITY    = 1<<1;

    private static final int DEVICE_CAPAB_CLIENT_DISCOVERABILITY    = 1<<1;

    @SuppressWarnings("unused")

    private static final int DEVICE_CAPAB_CONCURRENT_OPER           = 1<<2;

    private static final int DEVICE_CAPAB_CONCURRENT_OPER           = 1<<2;

    @SuppressWarnings("unused")

    private static final int DEVICE_CAPAB_INFRA_MANAGED             = 1<<3;

    private static final int DEVICE_CAPAB_INFRA_MANAGED             = 1<<3;

    @SuppressWarnings("unused")

    private static final int DEVICE_CAPAB_DEVICE_LIMIT              = 1<<4;

    private static final int DEVICE_CAPAB_DEVICE_LIMIT              = 1<<4;

    private static final int DEVICE_CAPAB_INVITATION_PROCEDURE      = 1<<5;

    private static final int DEVICE_CAPAB_INVITATION_PROCEDURE      = 1<<5;





    /* Group Capability bitmap */

    /* Group Capability bitmap */

    private static final int GROUP_CAPAB_GROUP_OWNER                = 1;

    private static final int GROUP_CAPAB_GROUP_OWNER                = 1;

    @SuppressWarnings("unused")

    private static final int GROUP_CAPAB_PERSISTENT_GROUP           = 1<<1;

    private static final int GROUP_CAPAB_PERSISTENT_GROUP           = 1<<1;

    private static final int GROUP_CAPAB_GROUP_LIMIT                = 1<<2;

    private static final int GROUP_CAPAB_GROUP_LIMIT                = 1<<2;

    @SuppressWarnings("unused")

    private static final int GROUP_CAPAB_INTRA_BSS_DIST             = 1<<3;

    private static final int GROUP_CAPAB_INTRA_BSS_DIST             = 1<<3;

    @SuppressWarnings("unused")

    private static final int GROUP_CAPAB_CROSS_CONN                 = 1<<4;

    private static final int GROUP_CAPAB_CROSS_CONN                 = 1<<4;

    @SuppressWarnings("unused")

    private static final int GROUP_CAPAB_PERSISTENT_RECONN          = 1<<5;

    private static final int GROUP_CAPAB_PERSISTENT_RECONN          = 1<<5;

    @SuppressWarnings("unused")

    private static final int GROUP_CAPAB_GROUP_FORMATION            = 1<<6;

    private static final int GROUP_CAPAB_GROUP_FORMATION            = 1<<6;





    /**

    /**
@@ -305,6 +314,7 @@ public class WifiP2pDevice implements Parcelable { 
        return other.deviceAddress.equals(deviceAddress);

        return other.deviceAddress.equals(deviceAddress);

    }

    }





    @Override

    public String toString() {

    public String toString() {

        StringBuffer sbuf = new StringBuffer();

        StringBuffer sbuf = new StringBuffer();

        sbuf.append("Device: ").append(deviceName);

        sbuf.append("Device: ").append(deviceName);
@@ -320,6 +330,7 @@ public class WifiP2pDevice implements Parcelable { 
    }

    }





    /** Implement the Parcelable interface */

    /** Implement the Parcelable interface */

    @Override

    public int describeContents() {

    public int describeContents() {

        return 0;

        return 0;

    }

    }
@@ -340,6 +351,7 @@ public class WifiP2pDevice implements Parcelable { 
    }

    }





    /** Implement the Parcelable interface */

    /** Implement the Parcelable interface */

    @Override

    public void writeToParcel(Parcel dest, int flags) {

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeString(deviceName);

        dest.writeString(deviceName);

        dest.writeString(deviceAddress);

        dest.writeString(deviceAddress);
@@ -360,6 +372,7 @@ public class WifiP2pDevice implements Parcelable { 
    /** Implement the Parcelable interface */

    /** Implement the Parcelable interface */

    public static final Creator<WifiP2pDevice> CREATOR =

    public static final Creator<WifiP2pDevice> CREATOR =

        new Creator<WifiP2pDevice>() {

        new Creator<WifiP2pDevice>() {

            @Override

            public WifiP2pDevice createFromParcel(Parcel in) {

            public WifiP2pDevice createFromParcel(Parcel in) {

                WifiP2pDevice device = new WifiP2pDevice();

                WifiP2pDevice device = new WifiP2pDevice();

                device.deviceName = in.readString();

                device.deviceName = in.readString();
@@ -376,6 +389,7 @@ public class WifiP2pDevice implements Parcelable { 
                return device;

                return device;

            }

            }





            @Override

            public WifiP2pDevice[] newArray(int size) {

            public WifiP2pDevice[] newArray(int size) {

                return new WifiP2pDevice[size];

                return new WifiP2pDevice[size];

            }

            }