Migrate to @OverRide to remove warnings.

jsharkey · jsharkey · commit bfdd680ab44d · 2012-04-09T10:57:21.000-07:00
Bug: 6303344
Change-Id: I0d33b2ed448467379d576ccd71fb5ae20c878852
diff --git a/core/java/android/net/NetworkQuotaInfo.java b/core/java/android/net/NetworkQuotaInfo.java
@@ -57,23 +57,25 @@ public long getHardLimitBytes() {
         return mHardLimitBytes;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public int describeContents() {
         return 0;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void writeToParcel(Parcel out, int flags) {
         out.writeLong(mEstimatedBytes);
         out.writeLong(mSoftLimitBytes);
         out.writeLong(mHardLimitBytes);
     }
 
     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];
         }
diff --git a/core/java/android/net/NetworkState.java b/core/java/android/net/NetworkState.java
@@ -52,12 +52,12 @@ public NetworkState(Parcel in) {
         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 void writeToParcel(Parcel out, int flags) {
     }
 
     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];
         }
diff --git a/core/java/android/net/NetworkStats.java b/core/java/android/net/NetworkStats.java
@@ -155,7 +155,7 @@ public NetworkStats(Parcel parcel) {
         operations = parcel.createLongArray();
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeLong(elapsedRealtime);
         dest.writeInt(size);
@@ -662,16 +662,18 @@ public String toString() {
         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];
         }
diff --git a/core/java/android/net/NetworkStatsHistory.java b/core/java/android/net/NetworkStatsHistory.java
@@ -130,7 +130,7 @@ public NetworkStatsHistory(Parcel in) {
         totalBytes = in.readLong();
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void writeToParcel(Parcel out, int flags) {
         out.writeLong(bucketDuration);
         writeLongArray(out, bucketStart, bucketCount);
@@ -191,7 +191,7 @@ public void writeToStream(DataOutputStream out) throws IOException {
         writeVarLongArray(out, operations, bucketCount);
     }
 
-    /** {@inheritDoc} */
+    @Override
     public int describeContents() {
         return 0;
     }
@@ -586,10 +586,12 @@ public String toString() {
     }
 
     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];
         }
diff --git a/services/java/com/android/server/net/NetworkPolicyManagerService.java b/services/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -1588,7 +1588,7 @@ private void updateRulesForUidLocked(int uid) {
     }
 
     private Handler.Callback mHandlerCallback = new Handler.Callback() {
-        /** {@inheritDoc} */
+        @Override
         public boolean handleMessage(Message msg) {
             switch (msg.what) {
                 case MSG_RULES_CHANGED: {
diff --git a/services/java/com/android/server/net/NetworkStatsCollection.java b/services/java/com/android/server/net/NetworkStatsCollection.java
@@ -57,8 +57,6 @@
  * {@link NetworkIdentitySet}, UID, set, and tag. Knows how to persist itself.
  */
 public class NetworkStatsCollection implements FileRotator.Reader {
-    private static final String TAG = "NetworkStatsCollection";
-
     /** File header magic number: "ANET" */
     private static final int FILE_MAGIC = 0x414E4554;
 
@@ -173,7 +171,7 @@ public NetworkStats getSummary(NetworkTemplate template, long start, long end) {
     }
 
     /**
-     * Record given {@link NetworkStats.Entry} into this collection.
+     * Record given {@link android.net.NetworkStats.Entry} into this collection.
      */
     public void recordData(NetworkIdentitySet ident, int uid, int set, int tag, long start,
             long end, NetworkStats.Entry entry) {
@@ -227,7 +225,7 @@ private NetworkStatsHistory findOrCreateHistory(
         }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void read(InputStream in) throws IOException {
         read(new DataInputStream(in));
     }
@@ -502,7 +500,7 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        /** {@inheritDoc} */
+        @Override
         public int compareTo(Key another) {
             return Integer.compare(uid, another.uid);
         }
diff --git a/services/java/com/android/server/net/NetworkStatsRecorder.java b/services/java/com/android/server/net/NetworkStatsRecorder.java
@@ -240,22 +240,22 @@ public CombiningRewriter(NetworkStatsCollection collection) {
             mCollection = checkNotNull(collection, "missing NetworkStatsCollection");
         }
 
-        /** {@inheritDoc} */
+        @Override
         public void reset() {
             // ignored
         }
 
-        /** {@inheritDoc} */
+        @Override
         public void read(InputStream in) throws IOException {
             mCollection.read(in);
         }
 
-        /** {@inheritDoc} */
+        @Override
         public boolean shouldWrite() {
             return true;
         }
 
-        /** {@inheritDoc} */
+        @Override
         public void write(OutputStream out) throws IOException {
             mCollection.write(new DataOutputStream(out));
             mCollection.reset();
@@ -275,24 +275,24 @@ public RemoveUidRewriter(long bucketDuration, int uid) {
             mUid = uid;
         }
 
-        /** {@inheritDoc} */
+        @Override
         public void reset() {
             mTemp.reset();
         }
 
-        /** {@inheritDoc} */
+        @Override
         public void read(InputStream in) throws IOException {
             mTemp.read(in);
             mTemp.clearDirty();
             mTemp.removeUid(mUid);
         }
 
-        /** {@inheritDoc} */
+        @Override
         public boolean shouldWrite() {
             return mTemp.isDirty();
         }
 
-        /** {@inheritDoc} */
+        @Override
         public void write(OutputStream out) throws IOException {
             mTemp.write(new DataOutputStream(out));
         }
diff --git a/services/java/com/android/server/net/NetworkStatsService.java b/services/java/com/android/server/net/NetworkStatsService.java
@@ -999,7 +999,7 @@ private NetworkStats getNetworkStatsTethering() throws RemoteException {
     }
 
     private Handler.Callback mHandlerCallback = new Handler.Callback() {
-        /** {@inheritDoc} */
+        @Override
         public boolean handleMessage(Message msg) {
             switch (msg.what) {
                 case MSG_PERFORM_POLL: {
@@ -1038,7 +1038,7 @@ private boolean isBandwidthControlEnabled() {
     }
 
     private class DropBoxNonMonotonicObserver implements NonMonotonicObserver<String> {
-        /** {@inheritDoc} */
+        @Override
         public void foundNonMonotonic(NetworkStats left, int leftIndex, NetworkStats right,
                 int rightIndex, String cookie) {
             Log.w(TAG, "found non-monotonic values; saving to dropbox");
@@ -1057,7 +1057,8 @@ public void foundNonMonotonic(NetworkStats left, int leftIndex, NetworkStats rig
     }
 
     /**
-     * Default external settings that read from {@link Settings.Secure}.
+     * Default external settings that read from
+     * {@link android.provider.Settings.Secure}.
      */
     private static class DefaultNetworkStatsSettings implements NetworkStatsSettings {
         private final ContentResolver mResolver;
@@ -1075,33 +1076,40 @@ private boolean getSecureBoolean(String name, boolean def) {
             return Settings.Secure.getInt(mResolver, name, defInt) != 0;
         }
 
+        @Override
         public long getPollInterval() {
             return getSecureLong(NETSTATS_POLL_INTERVAL, 30 * MINUTE_IN_MILLIS);
         }
+        @Override
         public long getTimeCacheMaxAge() {
             return getSecureLong(NETSTATS_TIME_CACHE_MAX_AGE, DAY_IN_MILLIS);
         }
+        @Override
         public long getGlobalAlertBytes() {
             return getSecureLong(NETSTATS_GLOBAL_ALERT_BYTES, 2 * MB_IN_BYTES);
         }
+        @Override
         public boolean getSampleEnabled() {
             return getSecureBoolean(NETSTATS_SAMPLE_ENABLED, true);
         }
 
+        @Override
         public Config getDevConfig() {
             return new Config(getSecureLong(NETSTATS_DEV_BUCKET_DURATION, HOUR_IN_MILLIS),
                     getSecureLong(NETSTATS_DEV_PERSIST_BYTES, 2 * MB_IN_BYTES),
                     getSecureLong(NETSTATS_DEV_ROTATE_AGE, 15 * DAY_IN_MILLIS),
                     getSecureLong(NETSTATS_DEV_DELETE_AGE, 90 * DAY_IN_MILLIS));
         }
 
+        @Override
         public Config getUidConfig() {
             return new Config(getSecureLong(NETSTATS_UID_BUCKET_DURATION, 2 * HOUR_IN_MILLIS),
                     getSecureLong(NETSTATS_UID_PERSIST_BYTES, 2 * MB_IN_BYTES),
                     getSecureLong(NETSTATS_UID_ROTATE_AGE, 15 * DAY_IN_MILLIS),
                     getSecureLong(NETSTATS_UID_DELETE_AGE, 90 * DAY_IN_MILLIS));
         }
 
+        @Override
         public Config getUidTagConfig() {
             return new Config(getSecureLong(NETSTATS_UID_BUCKET_DURATION, 2 * HOUR_IN_MILLIS),
                     getSecureLong(NETSTATS_UID_PERSIST_BYTES, 2 * MB_IN_BYTES),
diff --git a/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java
@@ -981,7 +981,7 @@ public Void get() throws InterruptedException, ExecutionException {
             }
         }
 
-        /** {@inheritDoc} */
+        @Override
         public boolean queueIdle() {
             set(null);
             return false;

Original file line number	Diff line number	Diff line change
`@@ -57,23 +57,25 @@ public long getHardLimitBytes() {`
`57`	`57`	`return mHardLimitBytes;`
`58`	`58`	`}`
`59`	`59`
`60`		`- /** {@inheritDoc} */`
	`60`	`+ @Override`
`61`	`61`	`public int describeContents() {`
`62`	`62`	`return 0;`
`63`	`63`	`}`
`64`	`64`
`65`		`- /** {@inheritDoc} */`
	`65`	`+ @Override`
`66`	`66`	`public void writeToParcel(Parcel out, int flags) {`
`67`	`67`	`out.writeLong(mEstimatedBytes);`
`68`	`68`	`out.writeLong(mSoftLimitBytes);`
`69`	`69`	`out.writeLong(mHardLimitBytes);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`public static final Creator<NetworkQuotaInfo> CREATOR = new Creator<NetworkQuotaInfo>() {`
	`73`	`+ @Override`
`73`	`74`	`public NetworkQuotaInfo createFromParcel(Parcel in) {`
`74`	`75`	`return new NetworkQuotaInfo(in);`
`75`	`76`	`}`
`76`	`77`
	`78`	`+ @Override`
`77`	`79`	`public NetworkQuotaInfo[] newArray(int size) {`
`78`	`80`	`return new NetworkQuotaInfo[size];`
`79`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,12 +52,12 @@ public NetworkState(Parcel in) {`
`52`	`52`	`subscriberId = in.readString();`
`53`	`53`	`}`
`54`	`54`
`55`		`- /** {@inheritDoc} */`
	`55`	`+ @Override`
`56`	`56`	`public int describeContents() {`
`57`	`57`	`return 0;`
`58`	`58`	`}`
`59`	`59`
`60`		`- /** {@inheritDoc} */`
	`60`	`+ @Override`
`61`	`61`	`public void writeToParcel(Parcel out, int flags) {`
`62`	`62`	`out.writeParcelable(networkInfo, flags);`
`63`	`63`	`out.writeParcelable(linkProperties, flags);`
`@@ -66,10 +66,12 @@ public void writeToParcel(Parcel out, int flags) {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public static final Creator<NetworkState> CREATOR = new Creator<NetworkState>() {`
	`69`	`+ @Override`
`69`	`70`	`public NetworkState createFromParcel(Parcel in) {`
`70`	`71`	`return new NetworkState(in);`
`71`	`72`	`}`
`72`	`73`
	`74`	`+ @Override`
`73`	`75`	`public NetworkState[] newArray(int size) {`
`74`	`76`	`return new NetworkState[size];`
`75`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public NetworkStats(Parcel parcel) {`
`155`	`155`	`operations = parcel.createLongArray();`
`156`	`156`	`}`
`157`	`157`
`158`		`- /** {@inheritDoc} */`
	`158`	`+ @Override`
`159`	`159`	`public void writeToParcel(Parcel dest, int flags) {`
`160`	`160`	`dest.writeLong(elapsedRealtime);`
`161`	`161`	`dest.writeInt(size);`
`@@ -662,16 +662,18 @@ public String toString() {`
`662`	`662`	`return writer.toString();`
`663`	`663`	`}`
`664`	`664`
`665`		`- /** {@inheritDoc} */`
	`665`	`+ @Override`
`666`	`666`	`public int describeContents() {`
`667`	`667`	`return 0;`
`668`	`668`	`}`
`669`	`669`
`670`	`670`	`public static final Creator<NetworkStats> CREATOR = new Creator<NetworkStats>() {`
	`671`	`+ @Override`
`671`	`672`	`public NetworkStats createFromParcel(Parcel in) {`
`672`	`673`	`return new NetworkStats(in);`
`673`	`674`	`}`
`674`	`675`
	`676`	`+ @Override`
`675`	`677`	`public NetworkStats[] newArray(int size) {`
`676`	`678`	`return new NetworkStats[size];`
`677`	`679`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public NetworkStatsHistory(Parcel in) {`
`130`	`130`	`totalBytes = in.readLong();`
`131`	`131`	`}`
`132`	`132`
`133`		`- /** {@inheritDoc} */`
	`133`	`+ @Override`
`134`	`134`	`public void writeToParcel(Parcel out, int flags) {`
`135`	`135`	`out.writeLong(bucketDuration);`
`136`	`136`	`writeLongArray(out, bucketStart, bucketCount);`
`@@ -191,7 +191,7 @@ public void writeToStream(DataOutputStream out) throws IOException {`
`191`	`191`	`writeVarLongArray(out, operations, bucketCount);`
`192`	`192`	`}`
`193`	`193`
`194`		`- /** {@inheritDoc} */`
	`194`	`+ @Override`
`195`	`195`	`public int describeContents() {`
`196`	`196`	`return 0;`
`197`	`197`	`}`
`@@ -586,10 +586,12 @@ public String toString() {`
`586`	`586`	`}`
`587`	`587`
`588`	`588`	`public static final Creator<NetworkStatsHistory> CREATOR = new Creator<NetworkStatsHistory>() {`
	`589`	`+ @Override`
`589`	`590`	`public NetworkStatsHistory createFromParcel(Parcel in) {`
`590`	`591`	`return new NetworkStatsHistory(in);`
`591`	`592`	`}`
`592`	`593`
	`594`	`+ @Override`
`593`	`595`	`public NetworkStatsHistory[] newArray(int size) {`
`594`	`596`	`return new NetworkStatsHistory[size];`
`595`	`597`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1588,7 +1588,7 @@ private void updateRulesForUidLocked(int uid) {`
`1588`	`1588`	`}`
`1589`	`1589`
`1590`	`1590`	`private Handler.Callback mHandlerCallback = new Handler.Callback() {`
`1591`		`- /** {@inheritDoc} */`
	`1591`	`+ @Override`
`1592`	`1592`	`public boolean handleMessage(Message msg) {`
`1593`	`1593`	`switch (msg.what) {`
`1594`	`1594`	`case MSG_RULES_CHANGED: {`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,6 @@`
`57`	`57`	`* {@link NetworkIdentitySet}, UID, set, and tag. Knows how to persist itself.`
`58`	`58`	`*/`
`59`	`59`	`public class NetworkStatsCollection implements FileRotator.Reader {`
`60`		`- private static final String TAG = "NetworkStatsCollection";`
`61`		`-`
`62`	`60`	`/** File header magic number: "ANET" */`
`63`	`61`	`private static final int FILE_MAGIC = 0x414E4554;`
`64`	`62`
`@@ -173,7 +171,7 @@ public NetworkStats getSummary(NetworkTemplate template, long start, long end) {`
`173`	`171`	`}`
`174`	`172`
`175`	`173`	`/**`
`176`		`- * Record given {@link NetworkStats.Entry} into this collection.`
	`174`	`+ * Record given {@link android.net.NetworkStats.Entry} into this collection.`
`177`	`175`	`*/`
`178`	`176`	`public void recordData(NetworkIdentitySet ident, int uid, int set, int tag, long start,`
`179`	`177`	`long end, NetworkStats.Entry entry) {`
`@@ -227,7 +225,7 @@ private NetworkStatsHistory findOrCreateHistory(`
`227`	`225`	`}`
`228`	`226`	`}`
`229`	`227`
`230`		`- /** {@inheritDoc} */`
	`228`	`+ @Override`
`231`	`229`	`public void read(InputStream in) throws IOException {`
`232`	`230`	`read(new DataInputStream(in));`
`233`	`231`	`}`
`@@ -502,7 +500,7 @@ public boolean equals(Object obj) {`
`502`	`500`	`return false;`
`503`	`501`	`}`
`504`	`502`
`505`		`- /** {@inheritDoc} */`
	`503`	`+ @Override`
`506`	`504`	`public int compareTo(Key another) {`
`507`	`505`	`return Integer.compare(uid, another.uid);`
`508`	`506`	`}`
Original file line number	Diff line number	Diff line change
`@@ -240,22 +240,22 @@ public CombiningRewriter(NetworkStatsCollection collection) {`
`240`	`240`	`mCollection = checkNotNull(collection, "missing NetworkStatsCollection");`
`241`	`241`	`}`
`242`	`242`
`243`		`- /** {@inheritDoc} */`
	`243`	`+ @Override`
`244`	`244`	`public void reset() {`
`245`	`245`	`// ignored`
`246`	`246`	`}`
`247`	`247`
`248`		`- /** {@inheritDoc} */`
	`248`	`+ @Override`
`249`	`249`	`public void read(InputStream in) throws IOException {`
`250`	`250`	`mCollection.read(in);`
`251`	`251`	`}`
`252`	`252`
`253`		`- /** {@inheritDoc} */`
	`253`	`+ @Override`
`254`	`254`	`public boolean shouldWrite() {`
`255`	`255`	`return true;`
`256`	`256`	`}`
`257`	`257`
`258`		`- /** {@inheritDoc} */`
	`258`	`+ @Override`
`259`	`259`	`public void write(OutputStream out) throws IOException {`
`260`	`260`	`mCollection.write(new DataOutputStream(out));`
`261`	`261`	`mCollection.reset();`
`@@ -275,24 +275,24 @@ public RemoveUidRewriter(long bucketDuration, int uid) {`
`275`	`275`	`mUid = uid;`
`276`	`276`	`}`
`277`	`277`
`278`		`- /** {@inheritDoc} */`
	`278`	`+ @Override`
`279`	`279`	`public void reset() {`
`280`	`280`	`mTemp.reset();`
`281`	`281`	`}`
`282`	`282`
`283`		`- /** {@inheritDoc} */`
	`283`	`+ @Override`
`284`	`284`	`public void read(InputStream in) throws IOException {`
`285`	`285`	`mTemp.read(in);`
`286`	`286`	`mTemp.clearDirty();`
`287`	`287`	`mTemp.removeUid(mUid);`
`288`	`288`	`}`
`289`	`289`
`290`		`- /** {@inheritDoc} */`
	`290`	`+ @Override`
`291`	`291`	`public boolean shouldWrite() {`
`292`	`292`	`return mTemp.isDirty();`
`293`	`293`	`}`
`294`	`294`
`295`		`- /** {@inheritDoc} */`
	`295`	`+ @Override`
`296`	`296`	`public void write(OutputStream out) throws IOException {`
`297`	`297`	`mTemp.write(new DataOutputStream(out));`
`298`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -981,7 +981,7 @@ public Void get() throws InterruptedException, ExecutionException {`
`981`	`981`	`}`
`982`	`982`	`}`
`983`	`983`
`984`		`- /** {@inheritDoc} */`
	`984`	`+ @Override`
`985`	`985`	`public boolean queueIdle() {`
`986`	`986`	`set(null);`
`987`	`987`	`return false;`