Merge "Modify the wake reasons data structure(2/2)" into mm-wireless-dev (2d3bea7f) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WifiWakeReasonAndCounts.java

+14 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,8 +16,8 @@

	package android.net.wifi;		package android.net.wifi;

	import android.os.Parcelable;
	import android.os.Parcel;		import android.os.Parcel;
			import android.os.Parcelable;

	/**		/**
	* A class representing wifi wake reason accounting.		* A class representing wifi wake reason accounting.
	@@ -52,6 +52,8 @@ public class WifiWakeReasonAndCounts implements Parcelable {
	public int ipv4RxMulticast;		public int ipv4RxMulticast;
	public int ipv6Multicast;		public int ipv6Multicast;
	public int otherRxMulticast;		public int otherRxMulticast;
			public int[] cmdEventWakeCntArray;
			public int[] driverFWLocalWakeCntArray;

	/* {@hide} */		/* {@hide} */
	public WifiWakeReasonAndCounts () {		public WifiWakeReasonAndCounts () {
	@@ -78,6 +80,13 @@ public class WifiWakeReasonAndCounts implements Parcelable {
	sb.append(" ipv4RxMulticast ").append(ipv4RxMulticast);		sb.append(" ipv4RxMulticast ").append(ipv4RxMulticast);
	sb.append(" ipv6Multicast ").append(ipv6Multicast);		sb.append(" ipv6Multicast ").append(ipv6Multicast);
	sb.append(" otherRxMulticast ").append(otherRxMulticast);		sb.append(" otherRxMulticast ").append(otherRxMulticast);
			for (int i = 0; i < cmdEventWakeCntArray.length; i++) {
			sb.append(" cmdEventWakeCntArray[" + i + "] " + cmdEventWakeCntArray[i]);
			}
			for (int i = 0; i < driverFWLocalWakeCntArray.length; i++) {
			sb.append(" driverFWLocalWakeCntArray[" + i + "] " + driverFWLocalWakeCntArray[i]);
			}

	return sb.toString();		return sb.toString();
	}		}

	@@ -111,6 +120,8 @@ public class WifiWakeReasonAndCounts implements Parcelable {
	dest.writeInt(ipv4RxMulticast);		dest.writeInt(ipv4RxMulticast);
	dest.writeInt(ipv6Multicast);		dest.writeInt(ipv6Multicast);
	dest.writeInt(otherRxMulticast);		dest.writeInt(otherRxMulticast);
			dest.writeIntArray(cmdEventWakeCntArray);
			dest.writeIntArray(driverFWLocalWakeCntArray);
	}		}

	/* Implement the Parcelable interface		/* Implement the Parcelable interface
	@@ -137,6 +148,8 @@ public class WifiWakeReasonAndCounts implements Parcelable {
	counts.ipv4RxMulticast = in.readInt();		counts.ipv4RxMulticast = in.readInt();
	counts.ipv6Multicast = in.readInt();		counts.ipv6Multicast = in.readInt();
	counts.otherRxMulticast = in.readInt();		counts.otherRxMulticast = in.readInt();
			in.readIntArray(counts.cmdEventWakeCntArray);
			in.readIntArray(counts.driverFWLocalWakeCntArray);
	return counts;		return counts;
	}		}
	/* Implement the Parcelable interface		/* Implement the Parcelable interface