Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix broken javadoc." into nyc-dev

Browse Source 
am: cadfc77

* commit 'cadfc77d0355ef57308ef1bf8bf43560d2b2e245':
  Fix broken javadoc.

Change-Id: I2ccd28ea9b50f8e7573e18565e665b2b82c1a410
This commit is contained in:
Jeff Sharkey
2016-04-12 23:42:24 +00:00
committed by android-build-merger
parent 910dbeeaf7 cadfc77d03
commit f58879ac19
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/TrafficStats.java
View File

@@ -228,7 +228,6 @@ public class TrafficStats {
* statistics parameters. * statistics parameters.
* *
* @see #setThreadStatsTag(int) * @see #setThreadStatsTag(int)
* @see #setThreadStatsUid(int)
*/ */
public static void tagSocket(Socket socket) throws SocketException { public static void tagSocket(Socket socket) throws SocketException {
SocketTagger.get().tag(socket); SocketTagger.get().tag(socket);
@@ -249,7 +248,6 @@ public class TrafficStats {
* parameters. * parameters.
* *
* @see #setThreadStatsTag(int) * @see #setThreadStatsTag(int)
* @see #setThreadStatsUid(int)
*/ */
public static void tagDatagramSocket(DatagramSocket socket) throws SocketException { public static void tagDatagramSocket(DatagramSocket socket) throws SocketException {
SocketTagger.get().tag(socket); SocketTagger.get().tag(socket);

4
core/java/android/os/storage/StorageManager.java
View File

@@ -1062,8 +1062,8 @@ public class StorageManager {
} }
/** /**
* Return if data stored at the given path will be encrypted while at rest. * Return if data stored at or under the given path will be encrypted while
* This can help apps avoid the overhead of double-encrypting data. * at rest. This can help apps avoid the overhead of double-encrypting data.
*/ */
public boolean isEncrypted(File file) { public boolean isEncrypted(File file) {
if (FileUtils.contains(Environment.getDataDirectory(), file)) { if (FileUtils.contains(Environment.getDataDirectory(), file)) {