diff options
| author | 2016-04-12 23:37:36 +0000 | |
|---|---|---|
| committer | 2016-04-12 23:37:38 +0000 | |
| commit | cadfc77d0355ef57308ef1bf8bf43560d2b2e245 (patch) | |
| tree | 78dbb191eee7e8be1b15b508b2e87197f8a13bdf | |
| parent | 0f10f043bea760c2f1480c3852ddc344553e625d (diff) | |
| parent | f82c2f08541481cae814e88a2b35f6d59d8d42aa (diff) | |
Merge "Fix broken javadoc." into nyc-dev
| -rw-r--r-- | core/java/android/net/TrafficStats.java | 2 | ||||
| -rw-r--r-- | core/java/android/os/storage/StorageManager.java | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java index cfd0468a6e27..1ac9fca51b77 100644 --- a/core/java/android/net/TrafficStats.java +++ b/core/java/android/net/TrafficStats.java @@ -228,7 +228,6 @@ public class TrafficStats { * statistics parameters. * * @see #setThreadStatsTag(int) - * @see #setThreadStatsUid(int) */ public static void tagSocket(Socket socket) throws SocketException { SocketTagger.get().tag(socket); @@ -249,7 +248,6 @@ public class TrafficStats { * parameters. * * @see #setThreadStatsTag(int) - * @see #setThreadStatsUid(int) */ public static void tagDatagramSocket(DatagramSocket socket) throws SocketException { SocketTagger.get().tag(socket); diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index da215c61641a..0a8fdd9fac3b 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -1062,8 +1062,8 @@ public class StorageManager { } /** - * Return if data stored at the given path will be encrypted while at rest. - * This can help apps avoid the overhead of double-encrypting data. + * Return if data stored at or under the given path will be encrypted while + * at rest. This can help apps avoid the overhead of double-encrypting data. */ public boolean isEncrypted(File file) { if (FileUtils.contains(Environment.getDataDirectory(), file)) { |