Merge "Remove RTT related code from wificond" into oc-mr1-dev

am: 7018247f52

Change-Id: I66a110dbfdc0dcd8241d6d53d30dec7ee5b2dab0

10 files changed, 0 insertions, 296 deletions

diff --git a/Android.mk b/Android.mk
index cd4855e..163e3d1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -59,8 +59,6 @@ LOCAL_SRC_FILES := \
     client_interface_impl.cpp \
     logging_utils.cpp \
     looper_backed_event_loop.cpp \
-    rtt/rtt_controller_binder.cpp \
-    rtt/rtt_controller_impl.cpp \
     scanning/channel_settings.cpp \
     scanning/hidden_network.cpp \
     scanning/offload_scan_callback_interface_impl.cpp \
@@ -122,8 +120,6 @@ LOCAL_SRC_FILES := \
     aidl/android/net/wifi/IClientInterface.aidl \
     aidl/android/net/wifi/IInterfaceEventCallback.aidl \
     aidl/android/net/wifi/IPnoScanEvent.aidl \
-    aidl/android/net/wifi/IRttClient.aidl \
-    aidl/android/net/wifi/IRttController.aidl \
     aidl/android/net/wifi/IScanEvent.aidl \
     aidl/android/net/wifi/IWificond.aidl \
     aidl/android/net/wifi/IWifiScannerImpl.aidl \
diff --git a/aidl/android/net/wifi/IRttClient.aidl b/aidl/android/net/wifi/IRttClient.aidl
deleted file mode 100644
index b58fdca..0000000
--- a/aidl/android/net/wifi/IRttClient.aidl
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2016 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.net.wifi;
-
-interface IRttClient {
-  // TODO(nywang) add functions
-}
diff --git a/aidl/android/net/wifi/IRttController.aidl b/aidl/android/net/wifi/IRttController.aidl
deleted file mode 100644
index 30f8d0d..0000000
--- a/aidl/android/net/wifi/IRttController.aidl
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2016 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.net.wifi;
-
-interface IRttController {
-  // TODO(nywang) add functions
-}
diff --git a/aidl/android/net/wifi/IWificond.aidl b/aidl/android/net/wifi/IWificond.aidl
index 48e2924..0b303ad 100644
--- a/aidl/android/net/wifi/IWificond.aidl
+++ b/aidl/android/net/wifi/IWificond.aidl
@@ -19,8 +19,6 @@ package android.net.wifi;
 import android.net.wifi.IApInterface;
 import android.net.wifi.IClientInterface;
 import android.net.wifi.IInterfaceEventCallback;
-import android.net.wifi.IRttClient;
-import android.net.wifi.IRttController;
 
 // Service interface that exposes primitives for controlling the WiFi
 // subsystems of a device.
@@ -57,14 +55,4 @@ interface IWificond {
     //
     // @param callback object to remove from the set of registered callbacks.
     oneway void UnregisterCallback(IInterfaceEventCallback callback);
-
-    // Obtain a reference to a IRttController that can be used to
-    // request ranging information.
-    // Results will be returned via the registered IRttClient.
-    IRttController registerRttClient(IRttClient rttClient);
-
-    // Remove an IRttClient from the set of registered IRttClient callbacks.
-    // @param rttClient object to remove from the set of registered
-    // IRttClient callbacks.
-    void unregisterRttClient(IRttClient rttClient);
 }
diff --git a/rtt/rtt_controller_binder.cpp b/rtt/rtt_controller_binder.cpp
deleted file mode 100644
index ba37018..0000000
--- a/rtt/rtt_controller_binder.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2016 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.
- */
-
-#include "wificond/rtt/rtt_controller_binder.h"
-
-#include "wificond/rtt/rtt_controller_impl.h"
-
-namespace android {
-namespace wificond {
-
-RttControllerBinder::RttControllerBinder(RttControllerImpl* impl) : impl_{impl} {
-}
-
-RttControllerBinder::~RttControllerBinder() {
-}
-
-}  // namespace wificond
-}  // namespace android
diff --git a/rtt/rtt_controller_binder.h b/rtt/rtt_controller_binder.h
deleted file mode 100644
index ed8ce81..0000000
--- a/rtt/rtt_controller_binder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2016 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.
- */
-
-#ifndef WIFICOND_RTT_CONTROLLER_BINDER_H_
-#define WIFICOND_RTT_CONTROLLER_BINDER_H_
-
-#include <android-base/macros.h>
-#include <binder/Status.h>
-
-#include "android/net/wifi/BnRttController.h"
-
-namespace android {
-namespace wificond {
-
-class RttControllerImpl;
-
-class RttControllerBinder : public android::net::wifi::BnRttController {
- public:
-  explicit RttControllerBinder(RttControllerImpl* impl);
-  ~RttControllerBinder() override;
-
-  // Called by |impl_| its destruction.
-  // This informs the binder proxy that no future manipulations of |impl_|
-  // by remote processes are possible.
-  void NotifyImplDead() { impl_ = nullptr; }
-
- private:
-  RttControllerImpl* impl_;
-
-  DISALLOW_COPY_AND_ASSIGN(RttControllerBinder);
-};
-
-}  // namespace wificond
-}  // namespace android
-
-#endif  // WIFICOND_RTT_CONTROLLER_BINDER_H_
diff --git a/rtt/rtt_controller_impl.cpp b/rtt/rtt_controller_impl.cpp
deleted file mode 100644
index 197faca..0000000
--- a/rtt/rtt_controller_impl.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2016 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.
- */
-
-#include "wificond/rtt/rtt_controller_impl.h"
-
-#include <android-base/logging.h>
-
-#include "wificond/rtt/rtt_controller_binder.h"
-
-using android::net::wifi::IRttClient;
-using android::net::wifi::IRttController;
-using android::sp;
-
-namespace android {
-namespace wificond {
-
-RttControllerImpl::RttControllerImpl()
-    : binder_(new RttControllerBinder(this)) {
-  // TODO(nywang): create a HAL RttController object.
-}
-
-RttControllerImpl::~RttControllerImpl() {
-  binder_->NotifyImplDead();
-}
-
-sp<IRttController> RttControllerImpl::GetBinder() const {
-  return binder_;
-}
-
-bool RttControllerImpl::RegisterRttClient(android::sp<IRttClient> client) {
-  for (auto& it : clients_) {
-    if (IRttClient::asBinder(client) == IRttClient::asBinder(it)) {
-      LOG(WARNING) << "Ignore duplicate RttClient registration";
-      return false;
-    }
-  }
-  clients_.push_back(client);
-  return true;
-
-}
-
-bool RttControllerImpl::UnregisterRttClient(android::sp<IRttClient> client) {
-  for (auto it = clients_.begin(); it != clients_.end(); it++) {
-    if (IRttClient::asBinder(client) == IRttClient::asBinder(*it)) {
-      clients_.erase(it);
-      return true;
-    }
-  }
-  LOG(WARNING) << "Failed to find registered RttClient to unregister";
-  return false;
-}
-
-size_t RttControllerImpl::GetClientCount() const {
-  return clients_.size();
-}
-
-}  // namespace wificond
-}  // namespace android
diff --git a/rtt/rtt_controller_impl.h b/rtt/rtt_controller_impl.h
deleted file mode 100644
index da650ef..0000000
--- a/rtt/rtt_controller_impl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2016 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.
- */
-
-#ifndef WIFICOND_RTT_CONTROLLER_IMPL_H_
-#define WIFICOND_RTT_CONTROLLER_IMPL_H_
-
-#include <vector>
-
-#include <android-base/macros.h>
-
-#include "android/net/wifi/IRttController.h"
-#include "android/net/wifi/IRttClient.h"
-
-namespace android {
-namespace wificond {
-
-class RttControllerBinder;
-
-class RttControllerImpl {
- public:
-  RttControllerImpl();
-  ~RttControllerImpl();
-
-  bool RegisterRttClient(android::sp<android::net::wifi::IRttClient> client);
-  bool UnregisterRttClient(android::sp<android::net::wifi::IRttClient> client);
-  size_t GetClientCount() const;
-
-  // Get a pointer to the binder representing this RttControllerImpl.
-  android::sp<android::net::wifi::IRttController> GetBinder() const;
-
- private:
-  const android::sp<RttControllerBinder> binder_;
-  std::vector<android::sp<android::net::wifi::IRttClient>> clients_;
-
-  DISALLOW_COPY_AND_ASSIGN(RttControllerImpl);
-};
-
-}  // namespace wificond
-}  // namespace android
-
-#endif  // WIFICOND_RTT_CONTROLLER_IMPL_H_
diff --git a/server.cpp b/server.cpp
index be57e89..88010fb 100644
--- a/server.cpp
+++ b/server.cpp
@@ -35,8 +35,6 @@ using android::IBinder;
 using android::net::wifi::IApInterface;
 using android::net::wifi::IClientInterface;
 using android::net::wifi::IInterfaceEventCallback;
-using android::net::wifi::IRttClient;
-using android::net::wifi::IRttController;
 using android::wifi_system::HostapdManager;
 using android::wifi_system::InterfaceTool;
 using android::wifi_system::SupplicantManager;
@@ -96,25 +94,6 @@ Status Server::UnregisterCallback(const sp<IInterfaceEventCallback>& callback) {
   return Status::ok();
 }
 
-Status Server::registerRttClient(const sp<IRttClient>& rtt_client,
-                                 sp<IRttController>* out_rtt_controller) {
-  if (rtt_controller_ == nullptr) {
-    rtt_controller_.reset(new RttControllerImpl());
-  }
-  rtt_controller_->RegisterRttClient(rtt_client);
-
-  *out_rtt_controller = rtt_controller_->GetBinder();
-  return Status::ok();
-}
-
-Status Server::unregisterRttClient(const sp<IRttClient>& rttClient) {
-  rtt_controller_->UnregisterRttClient(rttClient);
-  if (rtt_controller_->GetClientCount() == 0) {
-    rtt_controller_.reset();
-  }
-  return Status::ok();
-}
-
 Status Server::createApInterface(sp<IApInterface>* created_interface) {
   InterfaceInfo interface;
   if (!SetupInterface(&interface)) {
diff --git a/server.h b/server.h
index 8fc3d77..4c131d4 100644
--- a/server.h
+++ b/server.h
@@ -31,7 +31,6 @@
 
 #include "wificond/ap_interface_impl.h"
 #include "wificond/client_interface_impl.h"
-#include "wificond/rtt/rtt_controller_impl.h"
 
 namespace android {
 namespace wificond {
@@ -58,15 +57,6 @@ class Server : public android::net::wifi::BnWificond {
       const android::sp<android::net::wifi::IInterfaceEventCallback>&
           callback) override;
 
-  android::binder::Status registerRttClient(
-      const ::android::sp<::android::net::wifi::IRttClient>& rtt_client,
-      ::android::sp<::android::net::wifi::IRttController>*
-          out_rtt_controller) override;
-
-  android::binder::Status unregisterRttClient(
-      const ::android::sp<::android::net::wifi::IRttClient>&
-          rttClient) override;
-
   android::binder::Status createApInterface(
       android::sp<android::net::wifi::IApInterface>*
           created_interface) override;
@@ -120,8 +110,6 @@ class Server : public android::net::wifi::BnWificond {
   std::vector<android::sp<android::net::wifi::IInterfaceEventCallback>>
       interface_event_callbacks_;
 
-  std::unique_ptr<RttControllerImpl> rtt_controller_;
-
   // Cached interface list from kernel.
   std::vector<InterfaceInfo> interfaces_;