Merge "Migrate to @Override to remove warnings." (eaeee6a5) · Commits · e / os / android_frameworks_base

core/java/android/net/NetworkQuotaInfo.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -57,12 +57,12 @@ public class NetworkQuotaInfo implements Parcelable {
		return mHardLimitBytes;
		}

		/** {@inheritDoc} */
		@Override
		public int describeContents() {
		return 0;
		}

		/** {@inheritDoc} */
		@Override
		public void writeToParcel(Parcel out, int flags) {
		out.writeLong(mEstimatedBytes);
		out.writeLong(mSoftLimitBytes);
		@@ -70,10 +70,12 @@ public class NetworkQuotaInfo implements Parcelable {
		}

		public static final Creator<NetworkQuotaInfo> CREATOR = new Creator<NetworkQuotaInfo>() {
		@Override
		public NetworkQuotaInfo createFromParcel(Parcel in) {
		return new NetworkQuotaInfo(in);
		}

		@Override
		public NetworkQuotaInfo[] newArray(int size) {
		return new NetworkQuotaInfo[size];
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -52,12 +52,12 @@ public class NetworkState implements Parcelable {
		subscriberId = in.readString();
		}

		/** {@inheritDoc} */
		@Override
		public int describeContents() {
		return 0;
		}

		/** {@inheritDoc} */
		@Override
		public void writeToParcel(Parcel out, int flags) {
		out.writeParcelable(networkInfo, flags);
		out.writeParcelable(linkProperties, flags);
		@@ -66,10 +66,12 @@ public class NetworkState implements Parcelable {
		}

		public static final Creator<NetworkState> CREATOR = new Creator<NetworkState>() {
		@Override
		public NetworkState createFromParcel(Parcel in) {
		return new NetworkState(in);
		}

		@Override
		public NetworkState[] newArray(int size) {
		return new NetworkState[size];
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -155,7 +155,7 @@ public class NetworkStats implements Parcelable {
		operations = parcel.createLongArray();
		}

		/** {@inheritDoc} */
		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeLong(elapsedRealtime);
		dest.writeInt(size);
		@@ -662,16 +662,18 @@ public class NetworkStats implements Parcelable {
		return writer.toString();
		}

		/** {@inheritDoc} */
		@Override
		public int describeContents() {
		return 0;
		}

		public static final Creator<NetworkStats> CREATOR = new Creator<NetworkStats>() {
		@Override
		public NetworkStats createFromParcel(Parcel in) {
		return new NetworkStats(in);
		}

		@Override
		public NetworkStats[] newArray(int size) {
		return new NetworkStats[size];
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ public class NetworkStatsHistory implements Parcelable {
		totalBytes = in.readLong();
		}

		/** {@inheritDoc} */
		@Override
		public void writeToParcel(Parcel out, int flags) {
		out.writeLong(bucketDuration);
		writeLongArray(out, bucketStart, bucketCount);
		@@ -191,7 +191,7 @@ public class NetworkStatsHistory implements Parcelable {
		writeVarLongArray(out, operations, bucketCount);
		}

		/** {@inheritDoc} */
		@Override
		public int describeContents() {
		return 0;
		}
		@@ -586,10 +586,12 @@ public class NetworkStatsHistory implements Parcelable {
		}

		public static final Creator<NetworkStatsHistory> CREATOR = new Creator<NetworkStatsHistory>() {
		@Override
		public NetworkStatsHistory createFromParcel(Parcel in) {
		return new NetworkStatsHistory(in);
		}

		@Override
		public NetworkStatsHistory[] newArray(int size) {
		return new NetworkStatsHistory[size];
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -1588,7 +1588,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		}

		private Handler.Callback mHandlerCallback = new Handler.Callback() {
		/** {@inheritDoc} */
		@Override
		public boolean handleMessage(Message msg) {
		switch (msg.what) {
		case MSG_RULES_CHANGED: {