Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f58879ac authored Apr 12, 2016 by Jeff Sharkey Committed by android-build-merger Apr 12, 2016

Merge "Fix broken javadoc." into nyc-dev

am: cadfc77d

* commit 'cadfc77d':
  Fix broken javadoc.

Change-Id: I2ccd28ea9b50f8e7573e18565e665b2b82c1a410

parents 910dbeea cadfc77d

core/java/android/net/TrafficStats.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -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);

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)) {