Merge "Removing the older Trusted device AIDLs."
diff --git a/car-lib/src/android/car/trust/ICarTrustAgentBleCallback.aidl b/car-lib/src/android/car/trust/ICarTrustAgentBleCallback.aidl
deleted file mode 100644
index 9f28db9..0000000
--- a/car-lib/src/android/car/trust/ICarTrustAgentBleCallback.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2018 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.car.trust;
-
-import android.bluetooth.BluetoothDevice;
-
-/**
- * Callback interface for BLE connection state changes.
- *
- * @hide
- */
-oneway interface ICarTrustAgentBleCallback {
- /**
- * Called when the GATT server is started and BLE is successfully advertising.
- */
- void onBleServerStartSuccess();
-
- /**
- * Called when the BLE advertisement fails to start.
- * see AdvertiseCallback#ADVERTISE_FAILED_* for possible error codes.
- */
- void onBleServerStartFailure(int errorCode);
-
- /**
- * Called when a device is connected.
- */
- void onBleDeviceConnected(in BluetoothDevice device);
-
- /**
- * Called when a device is disconnected.
- */
- void onBleDeviceDisconnected(in BluetoothDevice device);
-}
diff --git a/car-lib/src/android/car/trust/ICarTrustAgentBleService.aidl b/car-lib/src/android/car/trust/ICarTrustAgentBleService.aidl
deleted file mode 100644
index 4dec6a0..0000000
--- a/car-lib/src/android/car/trust/ICarTrustAgentBleService.aidl
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2018 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.car.trust;
-
-import android.bluetooth.BluetoothDevice;
-import android.car.trust.ICarTrustAgentBleCallback;
-import android.car.trust.ICarTrustAgentEnrolmentCallback;
-import android.car.trust.ICarTrustAgentTokenRequestDelegate;
-import android.car.trust.ICarTrustAgentTokenResponseCallback;
-import android.car.trust.ICarTrustAgentUnlockCallback;
-
-/**
- * Binder interface for CarTrustAgentBleService.
- *
- * @hide
- */
-interface ICarTrustAgentBleService {
- /** General BLE */
- void registerBleCallback(in ICarTrustAgentBleCallback callback);
- void unregisterBleCallback(in ICarTrustAgentBleCallback callback);
-
- /** Enrolment */
- void startEnrolmentAdvertising();
- void stopEnrolmentAdvertising();
- void sendEnrolmentHandle(in BluetoothDevice device, long handle);
- void registerEnrolmentCallback(in ICarTrustAgentEnrolmentCallback callback);
- void unregisterEnrolmentCallback(in ICarTrustAgentEnrolmentCallback callback);
-
- /** Unlock */
- void startUnlockAdvertising();
- void stopUnlockAdvertising();
- void registerUnlockCallback(in ICarTrustAgentUnlockCallback callback);
- void unregisterUnlockCallback(in ICarTrustAgentUnlockCallback callback);
-
- /** Token request */
- void setTokenRequestDelegate(in ICarTrustAgentTokenRequestDelegate delegate);
- void revokeTrust();
- void addEscrowToken(in byte[] token, int uid);
- void removeEscrowToken(long handle, int uid);
- void isEscrowTokenActive(long handle, int uid);
-
- /** Token response */
- void setTokenResponseCallback(in ICarTrustAgentTokenResponseCallback callback);
- void onEscrowTokenAdded(in byte[] token, long handle, int uid);
- void onEscrowTokenRemoved(long handle, boolean successful);
- void onEscrowTokenActiveStateChanged(long handle, boolean active);
-
- /** Management */
- int getUserIdByEscrowTokenHandle(long tokenHandle);
-}
diff --git a/car-lib/src/android/car/trust/ICarTrustAgentEnrolmentCallback.aidl b/car-lib/src/android/car/trust/ICarTrustAgentEnrolmentCallback.aidl
deleted file mode 100644
index 7f12404..0000000
--- a/car-lib/src/android/car/trust/ICarTrustAgentEnrolmentCallback.aidl
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2018 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.car.trust;
-
-/**
- * Callback interface for CarTrustAgentService enrolment.
- *
- * @hide
- */
-oneway interface ICarTrustAgentEnrolmentCallback {
- /** Called when the enrolment data is received */
- void onEnrolmentDataReceived(in byte[] token);
-}
diff --git a/car-lib/src/android/car/trust/ICarTrustAgentTokenRequestDelegate.aidl b/car-lib/src/android/car/trust/ICarTrustAgentTokenRequestDelegate.aidl
deleted file mode 100644
index 3c61d4b..0000000
--- a/car-lib/src/android/car/trust/ICarTrustAgentTokenRequestDelegate.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2018 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.car.trust;
-
-/**
- * Delegate interface for escrow token exchange request.
- *
- * TrustAgentService uses async pattern and we therefore divide the
- * request and response into two separate AIDL interfaces.
- *
- * CarBleTrustAgent would implement this interface and set itself as a delegate.
- *
- * @hide
- */
-interface ICarTrustAgentTokenRequestDelegate {
- /** Called to revoke trust */
- void revokeTrust();
-
- /** Called to add escrow token for foreground user */
- void addEscrowToken(in byte[] token, int uid);
-
- /** Called to remove escrow token for foreground user */
- void removeEscrowToken(long handle, int uid);
-
- /** Called to query if the foreground user has active escrow token */
- void isEscrowTokenActive(long handle, int uid);
-}
diff --git a/car-lib/src/android/car/trust/ICarTrustAgentTokenResponseCallback.aidl b/car-lib/src/android/car/trust/ICarTrustAgentTokenResponseCallback.aidl
deleted file mode 100644
index 5dbc3bc..0000000
--- a/car-lib/src/android/car/trust/ICarTrustAgentTokenResponseCallback.aidl
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2018 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.car.trust;
-
-/**
- * Callback interface for escrow token exchange response.
- *
- * TrustAgentService uses async pattern and we therefore divide the
- * request and response into two separate AIDL interfaces.
- *
- * @hide
- */
-interface ICarTrustAgentTokenResponseCallback {
- /** Called after escrow token is added for foreground user */
- void onEscrowTokenAdded(out byte[] token, long handle, int uid);
-
- /** Called after escrow token is removed for foreground user */
- void onEscrowTokenRemoved(long handle, boolean successful);
-
- /** Called after escrow token active state is changed for foreground user */
- void onEscrowTokenActiveStateChanged(long handle, boolean active);
-}
diff --git a/car-lib/src/android/car/trust/ICarTrustAgentUnlockCallback.aidl b/car-lib/src/android/car/trust/ICarTrustAgentUnlockCallback.aidl
deleted file mode 100644
index e280bf0..0000000
--- a/car-lib/src/android/car/trust/ICarTrustAgentUnlockCallback.aidl
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2018 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.car.trust;
-
-/**
- * Callback interface for CarTrustAgentService unlock.
- *
- * @hide
- */
-oneway interface ICarTrustAgentUnlockCallback {
- /** Called when the unlock token is received */
- void onUnlockDataReceived(in byte[] token, long handle);
-}