commit cadfc77d0355ef57308ef1bf8bf43560d2b2e245
author Jeff Sharkey <jsharkey@google.com> Tue Apr 12 23:37:36 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 12 23:37:38 2016 +0000
tree 78dbb191eee7e8be1b15b508b2e87197f8a13bdf
parent 0f10f043bea760c2f1480c3852ddc344553e625d
parent f82c2f08541481cae814e88a2b35f6d59d8d42aa

Merge "Fix broken javadoc." into nyc-dev

core/java/android/net/TrafficStats.java

diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java
index cfd0468..1ac9fca 100644
--- a/core/java/android/net/TrafficStats.java
+++ b/core/java/android/net/TrafficStats.java
@@ -228,7 +228,6 @@
      * statistics parameters.
      *
      * @see #setThreadStatsTag(int)
-     * @see #setThreadStatsUid(int)
      */
     public static void tagSocket(Socket socket) throws SocketException {
         SocketTagger.get().tag(socket);
@@ -249,7 +248,6 @@
      * parameters.
      *
      * @see #setThreadStatsTag(int)
-     * @see #setThreadStatsUid(int)
      */
     public static void tagDatagramSocket(DatagramSocket socket) throws SocketException {
         SocketTagger.get().tag(socket);

core/java/android/os/storage/StorageManager.java

diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index da215c6..0a8fdd9 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -1062,8 +1062,8 @@
     }
 
     /**
-     * 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)) {