summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Hamilton <jham@android.com>2010-10-26 07:28:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-26 07:28:57 -0700
commit858825c54d382c24dcfbb9b85bea87ac4eee39ee (patch)
tree220d0746546603b1001ac6ffab4ef46d1043dfc6
parente7bc4f5e45714ebc822fb7f613a047cfebc91b2a (diff)
parent6a49bff5694439b3f892cfcfd90b814884f8d44f (diff)
downloadframeworks_base-858825c54d382c24dcfbb9b85bea87ac4eee39ee.zip
frameworks_base-858825c54d382c24dcfbb9b85bea87ac4eee39ee.tar.gz
frameworks_base-858825c54d382c24dcfbb9b85bea87ac4eee39ee.tar.bz2
am 6a49bff5: am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread
-rw-r--r--core/java/com/android/internal/nfc/LlcpServiceSocket.java3
-rw-r--r--core/java/com/android/internal/nfc/LlcpSocket.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/core/java/com/android/internal/nfc/LlcpServiceSocket.java b/core/java/com/android/internal/nfc/LlcpServiceSocket.java
index 4607527..318982b 100644
--- a/core/java/com/android/internal/nfc/LlcpServiceSocket.java
+++ b/core/java/com/android/internal/nfc/LlcpServiceSocket.java
@@ -78,8 +78,9 @@ public class LlcpServiceSocket {
* @param handle
* The handle returned by the NFC service and used to identify
* the socket in subsequent calls.
+ * @hide
*/
- LlcpServiceSocket(ILlcpServiceSocket service, ILlcpSocket socketService, int handle) {
+ public LlcpServiceSocket(ILlcpServiceSocket service, ILlcpSocket socketService, int handle) {
this.mService = service;
this.mHandle = handle;
this.mLlcpSocketService = socketService;
diff --git a/core/java/com/android/internal/nfc/LlcpSocket.java b/core/java/com/android/internal/nfc/LlcpSocket.java
index ae74002..b1b1320 100644
--- a/core/java/com/android/internal/nfc/LlcpSocket.java
+++ b/core/java/com/android/internal/nfc/LlcpSocket.java
@@ -78,8 +78,9 @@ public class LlcpSocket {
* @param handle
* The handle returned by the NFC service and used to identify
* the socket in subsequent calls.
+ * @hide
*/
- LlcpSocket(ILlcpSocket service, int handle) {
+ public LlcpSocket(ILlcpSocket service, int handle) {
this.mService = service;
this.mHandle = handle;
}