summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-02 02:03:59 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-02 02:03:59 +0000
commit8d6503fda7c3b3530ed81408c876ea2031c10337 (patch)
treede78685ef6444a66030726ce88fc48489b6f6940
parent7f5cbf4a24ca5c59a690030403c825cb2d1a267e (diff)
parent68f1a30c39e3f8b0c43a5ba24d8995fefd5241a1 (diff)
downloadobex-android13-s2-release.tar.gz
Snap for 8236285 from 68f1a30c39e3f8b0c43a5ba24d8995fefd5241a1 to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi
Change-Id: I03f3430a711db4db61719f56ac510b5685f183e3
-rw-r--r--Android.bp2
-rw-r--r--src/com/android/obex/ApplicationParameter.java (renamed from javax/obex/ApplicationParameter.java)2
-rw-r--r--src/com/android/obex/Authenticator.java (renamed from javax/obex/Authenticator.java)2
-rw-r--r--src/com/android/obex/BaseStream.java (renamed from javax/obex/BaseStream.java)2
-rw-r--r--src/com/android/obex/ClientOperation.java (renamed from javax/obex/ClientOperation.java)2
-rw-r--r--src/com/android/obex/ClientSession.java (renamed from javax/obex/ClientSession.java)2
-rw-r--r--src/com/android/obex/HeaderSet.java (renamed from javax/obex/HeaderSet.java)4
-rw-r--r--src/com/android/obex/ObexHelper.java (renamed from javax/obex/ObexHelper.java)2
-rw-r--r--src/com/android/obex/ObexPacket.java (renamed from javax/obex/ObexPacket.java)2
-rw-r--r--src/com/android/obex/ObexSession.java (renamed from javax/obex/ObexSession.java)2
-rw-r--r--src/com/android/obex/ObexTransport.java (renamed from javax/obex/ObexTransport.java)2
-rw-r--r--src/com/android/obex/Operation.java (renamed from javax/obex/Operation.java)2
-rw-r--r--src/com/android/obex/PasswordAuthentication.java (renamed from javax/obex/PasswordAuthentication.java)2
-rw-r--r--src/com/android/obex/PrivateInputStream.java (renamed from javax/obex/PrivateInputStream.java)2
-rw-r--r--src/com/android/obex/PrivateOutputStream.java (renamed from javax/obex/PrivateOutputStream.java)2
-rw-r--r--src/com/android/obex/ResponseCodes.java (renamed from javax/obex/ResponseCodes.java)2
-rw-r--r--src/com/android/obex/ServerOperation.java (renamed from javax/obex/ServerOperation.java)2
-rw-r--r--src/com/android/obex/ServerRequestHandler.java (renamed from javax/obex/ServerRequestHandler.java)2
-rw-r--r--src/com/android/obex/ServerSession.java (renamed from javax/obex/ServerSession.java)2
-rw-r--r--src/com/android/obex/SessionNotifier.java (renamed from javax/obex/SessionNotifier.java)2
20 files changed, 21 insertions, 21 deletions
diff --git a/Android.bp b/Android.bp
index d0e5041..db6b4af 100644
--- a/Android.bp
+++ b/Android.bp
@@ -30,7 +30,7 @@ license {
}
java_library {
- name: "obex",
+ name: "com.android.obex",
srcs: ["**/*.java"],
apex_available: [
diff --git a/javax/obex/ApplicationParameter.java b/src/com/android/obex/ApplicationParameter.java
index c2f14c6..138f9a3 100644
--- a/javax/obex/ApplicationParameter.java
+++ b/src/com/android/obex/ApplicationParameter.java
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
/**
* Represents an Application Parameter header for OBEX as defined by the IrDA specification.
diff --git a/javax/obex/Authenticator.java b/src/com/android/obex/Authenticator.java
index 12ef47f..0d028e8 100644
--- a/javax/obex/Authenticator.java
+++ b/src/com/android/obex/Authenticator.java
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
/**
* This interface provides a way to respond to authentication challenge and
diff --git a/javax/obex/BaseStream.java b/src/com/android/obex/BaseStream.java
index 440e060..f656a67 100644
--- a/javax/obex/BaseStream.java
+++ b/src/com/android/obex/BaseStream.java
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
import java.io.IOException;
diff --git a/javax/obex/ClientOperation.java b/src/com/android/obex/ClientOperation.java
index d5387d1..8aa15c3 100644
--- a/javax/obex/ClientOperation.java
+++ b/src/com/android/obex/ClientOperation.java
@@ -32,7 +32,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
diff --git a/javax/obex/ClientSession.java b/src/com/android/obex/ClientSession.java
index fcdc2c7..c3d876f 100644
--- a/javax/obex/ClientSession.java
+++ b/src/com/android/obex/ClientSession.java
@@ -32,7 +32,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
import android.util.Log;
diff --git a/javax/obex/HeaderSet.java b/src/com/android/obex/HeaderSet.java
index 8ce8d5f..28c12ae 100644
--- a/javax/obex/HeaderSet.java
+++ b/src/com/android/obex/HeaderSet.java
@@ -31,7 +31,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -39,7 +39,7 @@ import java.security.SecureRandom;
import java.util.Calendar;
/**
- * This class implements the javax.obex.HeaderSet interface for OBEX over
+ * This class implements the com.android.obex.HeaderSet interface for OBEX over
* RFCOMM or OBEX over l2cap.
*/
public final class HeaderSet {
diff --git a/javax/obex/ObexHelper.java b/src/com/android/obex/ObexHelper.java
index 30dc8f8..5a21252 100644
--- a/javax/obex/ObexHelper.java
+++ b/src/com/android/obex/ObexHelper.java
@@ -32,7 +32,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
import android.util.Log;
diff --git a/javax/obex/ObexPacket.java b/src/com/android/obex/ObexPacket.java
index bb6c96e..be8446a 100644
--- a/javax/obex/ObexPacket.java
+++ b/src/com/android/obex/ObexPacket.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package javax.obex;
+package com.android.obex;
import java.io.IOException;
import java.io.InputStream;
diff --git a/javax/obex/ObexSession.java b/src/com/android/obex/ObexSession.java
index 373e573..a3abc19 100644
--- a/javax/obex/ObexSession.java
+++ b/src/com/android/obex/ObexSession.java
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
import android.util.Log;
diff --git a/javax/obex/ObexTransport.java b/src/com/android/obex/ObexTransport.java
index cb16c17..f3090dc 100644
--- a/javax/obex/ObexTransport.java
+++ b/src/com/android/obex/ObexTransport.java
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
import java.io.DataInputStream;
import java.io.DataOutputStream;
diff --git a/javax/obex/Operation.java b/src/com/android/obex/Operation.java
index 1f6c20a..03ca603 100644
--- a/javax/obex/Operation.java
+++ b/src/com/android/obex/Operation.java
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
import java.io.DataInputStream;
import java.io.DataOutputStream;
diff --git a/javax/obex/PasswordAuthentication.java b/src/com/android/obex/PasswordAuthentication.java
index cb2303e..4c464d0 100644
--- a/javax/obex/PasswordAuthentication.java
+++ b/src/com/android/obex/PasswordAuthentication.java
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
/**
* This class holds user name and password combinations.
diff --git a/javax/obex/PrivateInputStream.java b/src/com/android/obex/PrivateInputStream.java
index 18219f9..b5ea71c 100644
--- a/javax/obex/PrivateInputStream.java
+++ b/src/com/android/obex/PrivateInputStream.java
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
import java.io.IOException;
import java.io.InputStream;
diff --git a/javax/obex/PrivateOutputStream.java b/src/com/android/obex/PrivateOutputStream.java
index e8bfd1c..5bda078 100644
--- a/javax/obex/PrivateOutputStream.java
+++ b/src/com/android/obex/PrivateOutputStream.java
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/javax/obex/ResponseCodes.java b/src/com/android/obex/ResponseCodes.java
index a46490d..796bf29 100644
--- a/javax/obex/ResponseCodes.java
+++ b/src/com/android/obex/ResponseCodes.java
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
/**
* The <code>ResponseCodes</code> class contains the list of valid response
diff --git a/javax/obex/ServerOperation.java b/src/com/android/obex/ServerOperation.java
index 4e77b6c..43b7138 100644
--- a/javax/obex/ServerOperation.java
+++ b/src/com/android/obex/ServerOperation.java
@@ -31,7 +31,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
import android.util.Log;
diff --git a/javax/obex/ServerRequestHandler.java b/src/com/android/obex/ServerRequestHandler.java
index f33f234..95cd31f 100644
--- a/javax/obex/ServerRequestHandler.java
+++ b/src/com/android/obex/ServerRequestHandler.java
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
/**
* The <code>ServerRequestHandler</code> class defines an event listener that
diff --git a/javax/obex/ServerSession.java b/src/com/android/obex/ServerSession.java
index 68cd766..41adcbe 100644
--- a/javax/obex/ServerSession.java
+++ b/src/com/android/obex/ServerSession.java
@@ -32,7 +32,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
import android.util.Log;
diff --git a/javax/obex/SessionNotifier.java b/src/com/android/obex/SessionNotifier.java
index d2760f7..b0f10de 100644
--- a/javax/obex/SessionNotifier.java
+++ b/src/com/android/obex/SessionNotifier.java
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-package javax.obex;
+package com.android.obex;
import java.io.IOException;