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

Commit c8909501 authored by Jeff Hamilton's avatar Jeff Hamilton Committed by Android (Google) Code Review
Browse files

Merge "Remove the binder interface for LLCP."

parents 53ad2c7f c3afd39c

Android.mk

+0 −5
Original line number Diff line number Diff line
@@ -116,15 +116,10 @@ LOCAL_SRC_FILES += \ 
	core/java/android/net/INetworkPolicyListener.aidl \

	core/java/android/net/INetworkPolicyManager.aidl \

	core/java/android/net/INetworkStatsService.aidl \

	core/java/android/nfc/ILlcpConnectionlessSocket.aidl \

	core/java/android/nfc/ILlcpServiceSocket.aidl \

	core/java/android/nfc/ILlcpSocket.aidl \

	core/java/android/nfc/INdefPushCallback.aidl \

	core/java/android/nfc/INfcAdapter.aidl \

	core/java/android/nfc/INfcAdapterExtras.aidl \

	core/java/android/nfc/INfcTag.aidl \

	core/java/android/nfc/IP2pInitiator.aidl \

	core/java/android/nfc/IP2pTarget.aidl \

	core/java/android/os/IHardwareService.aidl \

	core/java/android/os/IMessenger.aidl \

	core/java/android/os/INetworkManagementService.aidl \

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/os)

$(call add-clean-step, rm -rf $(OUT_DIR)target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/keystore/java/android/security/IKeyChainAliasResponse.java)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/vpn)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/nfc)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/java/android/nfc/ILlcpConnectionlessSocket.aidl

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.nfc;



import android.nfc.LlcpPacket;



/**

 * @hide

 */

interface ILlcpConnectionlessSocket

{

    void close(int nativeHandle);

    int getSap(int nativeHandle);

    LlcpPacket receiveFrom(int nativeHandle);

    int sendTo(int nativeHandle, in LlcpPacket packet);

}
 
 No newline at end of file

core/java/android/nfc/ILlcpServiceSocket.aidl

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.nfc;



/**

 * {@hide}

 */

interface ILlcpServiceSocket

{

    int accept(int nativeHandle);

    void close(int nativeHandle);

}

core/java/android/nfc/ILlcpSocket.aidl

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.nfc;



/**

 * @hide

 */

interface ILlcpSocket

{

    int close(int nativeHandle);

    int connect(int nativeHandle, int sap);

    int connectByName(int nativeHandle, String sn);

    int getLocalSap(int nativeHandle);

    int getLocalSocketMiu(int nativeHandle);

    int getLocalSocketRw(int nativeHandle);

    int getRemoteSocketMiu(int nativeHandle);

    int getRemoteSocketRw(int nativeHandle);

    int receive(int nativeHandle, out byte[] receiveBuffer);

    int send(int nativeHandle, in byte[] data);

}
 
 No newline at end of file