Merge lp:~brandontschaefer/mir/no-android-input-channel-v2 into lp:mir

[Brandon Schaefer]

Remove the usage of android input channel. Slowly removing all usage of the android input sender/receiver as well as the input channel.

Remove the usage of android input channel. Slowly removing all usage of the android input sender/receiver as well as the input channel.

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3440
https://mir-jenkins.ubuntu.com/job/mir-ci/760/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/743
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/780
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/771
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/771
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/752
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/752/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/752
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/752/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/752
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/752/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/752
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/752/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/752
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/752/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/760/rebuild

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

hmm not sure why you need that change - I would have guessed that you will InputChannel in the end. But the change looks fine.

nit:
156 newline before opening the block

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

Ok

review: Approve

[Kevin DuBois (kdub)]

lgtm

review: Approve

=== modified file '3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h'
--- 3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h	2016-01-29 08:18:22 +0000
+++ 3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h	2016-04-05 21:21:50 +0000
@@ -141,12 +141,6 @@
 public:
     InputChannel(const String8& name, int fd);
 
-    /* Creates a pair of input channels.
-     *
-     * Returns OK on success.
-     */
-    static status_t openInputFdPair(int& server_fd, int& client_fd);
-
     inline String8 getName() const { return mName; }
     inline int getFd() const { return mFd; }
 

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp	2016-03-23 06:39:56 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputTransport.cpp	2016-04-05 21:21:50 +0000
@@ -32,12 +32,6 @@
 
 namespace android {
 
-// Socket buffer size.  The default is typically about 128KB, which is much larger than
-// we really need.  So we make it smaller.  It just needs to be big enough to hold
-// a few dozen large multi-finger motion events in the case where an application gets
-// behind processing touches.
-static const size_t SOCKET_BUFFER_SIZE = 32 * 1024;
-
 // Nanoseconds per milliseconds.
 static constexpr const std::chrono::nanoseconds NANOS_PER_MS = std::chrono::nanoseconds(1000000);
 
@@ -117,29 +111,6 @@
 #endif
 }
 
-status_t InputChannel::openInputFdPair(int& server_fd, int& client_fd) {
-    int sockets[2];
-    if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, sockets)) {
-        status_t result = -errno;
-        ALOGE("InputChannel ~ Could not create socket pair.  errno=%d",
-            errno);
-        server_fd = client_fd = 0;
-
-        return result;
-    }
-
-    int bufferSize = SOCKET_BUFFER_SIZE;
-    setsockopt(sockets[0], SOL_SOCKET, SO_SNDBUF, &bufferSize, sizeof(bufferSize));
-    setsockopt(sockets[0], SOL_SOCKET, SO_RCVBUF, &bufferSize, sizeof(bufferSize));
-    setsockopt(sockets[1], SOL_SOCKET, SO_SNDBUF, &bufferSize, sizeof(bufferSize));
-    setsockopt(sockets[1], SOL_SOCKET, SO_RCVBUF, &bufferSize, sizeof(bufferSize));
-
-    server_fd = sockets[0];
-    client_fd = sockets[1];
-    
-    return OK;
-}
-
 status_t InputChannel::sendMessage(const InputMessage* msg) {
     size_t msgLength = msg->size();
     ssize_t nWrite;

=== modified file 'src/server/input/CMakeLists.txt'
--- src/server/input/CMakeLists.txt	2016-03-23 06:39:56 +0000
+++ src/server/input/CMakeLists.txt	2016-04-05 21:21:50 +0000
@@ -6,6 +6,8 @@
 
   basic_seat.cpp
   builtin_cursor_images.cpp
+  channel.cpp
+  channel_factory.cpp
   cursor_controller.cpp
   default_configuration.cpp
   default_device.cpp

=== modified file 'src/server/input/android/CMakeLists.txt'
--- src/server/input/android/CMakeLists.txt	2016-01-29 08:18:22 +0000
+++ src/server/input/android/CMakeLists.txt	2016-04-05 21:21:50 +0000
@@ -1,7 +1,5 @@
 list(
   APPEND INPUT_SOURCES
-  ${CMAKE_CURRENT_SOURCE_DIR}/android_input_channel.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/input_channel_factory.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/input_sender.cpp
 )
 

=== renamed file 'src/server/input/android/android_input_channel.cpp' => 'src/server/input/channel.cpp'
--- src/server/input/android/android_input_channel.cpp	2014-03-06 06:05:17 +0000
+++ src/server/input/channel.cpp	2016-04-05 21:21:50 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013,2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3,
@@ -14,35 +14,50 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Robert Carr <[e-mail]>
+ *              Brandon Schaefer <[e-mail]>
  */
 
-#include "android_input_channel.h"
-
-#include <androidfw/InputTransport.h>
-
-#include <unistd.h>
-
-namespace mia = mir::input::android;
-namespace droidinput = android;
-
-mia::AndroidInputChannel::AndroidInputChannel()
-{
-
-    droidinput::InputChannel::openInputFdPair(s_fd, c_fd);
-}
-
-mia::AndroidInputChannel::~AndroidInputChannel()
-{
-    close(s_fd);
-    close(c_fd);
-}
-
-int mia::AndroidInputChannel::client_fd() const
-{
-    return c_fd;
-}
-
-int mia::AndroidInputChannel::server_fd() const
-{
-    return s_fd;
+#include <system_error>
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include "channel.h"
+
+#include <boost/throw_exception.hpp>
+
+namespace mi = mir::input;
+
+namespace
+{
+// Default is 128KB which is larger then we need. Use a smaller size.
+int const buffer_size{32 * 1024};
+}
+
+mi::Channel::Channel()
+{
+    int sockets[2];
+    if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, sockets)) {
+        BOOST_THROW_EXCEPTION(std::system_error(
+            errno,
+            std::system_category(),
+            "Could not create socket pair."));
+    }
+    server_fd_ = mir::Fd(sockets[0]);
+    client_fd_ = mir::Fd(sockets[1]);
+
+    int size = buffer_size;
+    setsockopt(server_fd_, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size));
+    setsockopt(server_fd_, SOL_SOCKET, SO_RCVBUF, &size, sizeof(size));
+    setsockopt(client_fd_, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size));
+    setsockopt(client_fd_, SOL_SOCKET, SO_RCVBUF, &size, sizeof(size));
+}
+
+int mi::Channel::server_fd() const
+{
+    return server_fd_;
+}
+
+int mi::Channel::client_fd() const
+{
+    return client_fd_;
 }

=== renamed file 'src/server/input/android/android_input_channel.h' => 'src/server/input/channel.h'
--- src/server/input/android/android_input_channel.h	2015-02-22 07:46:25 +0000
+++ src/server/input/channel.h	2016-04-05 21:21:50 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013,2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3,
@@ -14,46 +14,35 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Robert Carr <[e-mail]>
+ *              Brandon Schaefer <[e-mail]>
  */
 
-#ifndef MIR_INPUT_ANDROID_INPUT_CHANNEL_H_
-#define MIR_INPUT_ANDROID_INPUT_CHANNEL_H_
+#ifndef MIR_INPUT_CHANNEL_H_
+#define MIR_INPUT_CHANNEL_H_
 
+#include "mir/fd.h"
 #include "mir/input/input_channel.h"
 
-namespace android
-{
-class InputChannel;
-}
-
-namespace droidinput = android;
-
 namespace mir
 {
 namespace input
 {
-namespace android
-{
 
-class AndroidInputChannel : public InputChannel
+class Channel : public InputChannel
 {
 public:
-    explicit AndroidInputChannel();
-    virtual ~AndroidInputChannel();
-
-    int client_fd() const;
-    int server_fd() const;
-
-protected:
-    AndroidInputChannel(AndroidInputChannel const&) = delete;
-    AndroidInputChannel& operator=(AndroidInputChannel const&) = delete;
+    Channel();
+    virtual ~Channel() override = default;
+
+    int client_fd() const override;
+    int server_fd() const override;
 
 private:
-    int s_fd, c_fd;
+    Fd server_fd_;
+    Fd client_fd_;
 };
 
 }
 }
-} // namespace mir
 
-#endif // MIR_INPUT_ANDROID_INPUT_CHANNEL_H_
+#endif /* MIR_INPUT_CHANNEL_H_ */

=== renamed file 'src/server/input/android/input_channel_factory.cpp' => 'src/server/input/channel_factory.cpp'
--- src/server/input/android/input_channel_factory.cpp	2014-04-10 12:59:14 +0000
+++ src/server/input/channel_factory.cpp	2016-04-05 21:21:50 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 Canonical Ltd.
+ * Copyright © 2014,2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3,
@@ -16,13 +16,12 @@
  * Authored by: Andreas Pokorny <[e-mail]>
  */
 
-#include "input_channel_factory.h"
-#include "android_input_channel.h"
+#include "channel.h"
+#include "channel_factory.h"
 
 namespace mi = mir::input;
-namespace mia = mi::android;
 
-std::shared_ptr<mi::InputChannel> mia::InputChannelFactory::make_input_channel()
+std::shared_ptr<mi::InputChannel> mi::ChannelFactory::make_input_channel()
 {
-    return std::make_shared<mia::AndroidInputChannel>();
+    return std::make_shared<mi::Channel>();
 }

=== renamed file 'src/server/input/android/input_channel_factory.h' => 'src/server/input/channel_factory.h'
--- src/server/input/android/input_channel_factory.h	2014-04-10 12:59:14 +0000
+++ src/server/input/channel_factory.h	2016-04-05 21:21:50 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 Canonical Ltd.
+ * Copyright © 2014,2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3,
@@ -16,8 +16,8 @@
  * Authored by: Andreas Pokorny <[e-mail]>
  */
 
-#ifndef MIR_INPUT_ANDROID_INPUT_CHANNEL_FACTORY_H_
-#define MIR_INPUT_ANDROID_INPUT_CHANNEL_FACTORY_H_
+#ifndef MIR_INPUT_CHANNEL_FACTORY_H_
+#define MIR_INPUT_CHANNEL_FACTORY_H_
 
 #include "mir/input/input_channel_factory.h"
 
@@ -25,20 +25,18 @@
 {
 namespace input
 {
-namespace android
-{
-class InputChannelFactory : public mir::input::InputChannelFactory
+
+class ChannelFactory : public InputChannelFactory
 {
 public:
-    std::shared_ptr<mir::input::InputChannel> make_input_channel() override;
+    virtual std::shared_ptr<InputChannel> make_input_channel() override;
 
-    InputChannelFactory() = default;
-    InputChannelFactory(InputChannelFactory const&) = delete;
-    InputChannelFactory& operator=(InputChannelFactory const&) = delete;
+    ChannelFactory() = default;
+    ChannelFactory(ChannelFactory const&) = delete;
+    ChannelFactory& operator=(ChannelFactory const&) = delete;
 };
 
 }
 }
-} // namespace mir
 
-#endif
+#endif /* MIR_INPUT_CHANNEL_FACTORY_H_ */

=== modified file 'src/server/input/default_configuration.cpp'
--- src/server/input/default_configuration.cpp	2016-03-23 06:39:56 +0000
+++ src/server/input/default_configuration.cpp	2016-04-05 21:21:50 +0000
@@ -19,10 +19,10 @@
 #include "mir/default_server_configuration.h"
 
 #include "android/input_sender.h"
-#include "android/input_channel_factory.h"
 #include "key_repeat_dispatcher.h"
 #include "display_input_region.h"
 #include "event_filter_chain_dispatcher.h"
+#include "channel_factory.h"
 #include "cursor_controller.h"
 #include "touchspot_controller.h"
 #include "null_input_manager.h"
@@ -161,7 +161,7 @@
     if (!options->get<bool>(options::enable_input_opt))
         return std::make_shared<mi::NullInputChannelFactory>();
     else
-        return std::make_shared<mia::InputChannelFactory>();
+        return std::make_shared<mi::ChannelFactory>();
 }
 
 std::shared_ptr<mi::CursorListener>

=== modified file 'tests/unit-tests/client/input/test_android_input_receiver.cpp'
--- tests/unit-tests/client/input/test_android_input_receiver.cpp	2016-03-29 03:41:45 +0000
+++ tests/unit-tests/client/input/test_android_input_receiver.cpp	2016-04-05 21:21:50 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "src/client/input/android/android_input_receiver.h"
+#include "src/server/input/channel.h"
 #include "mir/input/null_input_receiver_report.h"
 #include "mir/input/xkb_mapper.h"
 #include "mir/events/event_private.h"
@@ -40,6 +41,7 @@
 namespace mircva = mircv::android;
 namespace md = mir::dispatch;
 namespace mt = mir::test;
+namespace mi = mir::input;
 
 namespace droidinput = android;
 
@@ -130,24 +132,13 @@
 class AndroidInputReceiverSetup : public testing::Test
 {
 public:
-    AndroidInputReceiverSetup()
-    {
-        auto status = droidinput::InputChannel::openInputFdPair(server_fd, client_fd);
-        EXPECT_EQ(droidinput::OK, status);
-    }
-    ~AndroidInputReceiverSetup()
-    {
-        close(server_fd);
-        close(client_fd);
-    }
-
     void flush_channels()
     {
-        fsync(server_fd);
-        fsync(client_fd);
+        fsync(channel.server_fd());
+        fsync(channel.client_fd());
     }
 
-    int server_fd, client_fd;
+    mi::Channel channel;
 
     static std::chrono::milliseconds const next_event_timeout;
     std::function<void(MirEvent*)> event_handler{[](MirEvent*){}};
@@ -159,7 +150,7 @@
 TEST_F(AndroidInputReceiverSetup, receiver_receives_key_events)
 {
     MirKeyboardEvent last_event;
-    mircva::InputReceiver receiver{client_fd,
+    mircva::InputReceiver receiver{channel.client_fd(),
                                    std::make_shared<mircv::XKBMapper>(),
                                    [&last_event](MirEvent* ev)
                                    {
@@ -169,7 +160,7 @@
                                        }
                                    },
                                    std::make_shared<mircv::NullInputReceiverReport>()};
-    TestingInputProducer producer{server_fd};
+    TestingInputProducer producer{channel.server_fd()};
 
     producer.produce_a_key_event();
 
@@ -184,11 +175,11 @@
 
 TEST_F(AndroidInputReceiverSetup, receiver_handles_events)
 {
-    mircva::InputReceiver receiver{client_fd,
+    mircva::InputReceiver receiver{channel.client_fd(),
                                    std::make_shared<mircv::XKBMapper>(),
                                    event_handler,
                                    std::make_shared<mircv::NullInputReceiverReport>()};
-    TestingInputProducer producer(server_fd);
+    TestingInputProducer producer(channel.server_fd());
 
     producer.produce_a_key_event();
     flush_channels();
@@ -203,12 +194,12 @@
 
 TEST_F(AndroidInputReceiverSetup, receiver_consumes_batched_motion_events)
 {
-    mircva::InputReceiver receiver{client_fd,
+    mircva::InputReceiver receiver{channel.client_fd(),
                                    std::make_shared<mircv::XKBMapper>(),
                                    event_handler,
                                    std::make_shared<mircv::NullInputReceiverReport>()};
 
-    TestingInputProducer producer(server_fd);
+    TestingInputProducer producer(channel.server_fd());
 
     // Produce 3 motion events before client handles any.
     producer.produce_a_pointer_event(0, 0, std::chrono::nanoseconds(0));
@@ -235,7 +226,7 @@
     std::unique_ptr<MirEvent> ev;
     bool handler_called{false};
 
-    mircva::InputReceiver receiver{client_fd,
+    mircva::InputReceiver receiver{channel.client_fd(),
                                    std::make_shared<mircv::XKBMapper>(),
                                    [&ev, &handler_called](MirEvent* event)
                                    {
@@ -247,7 +238,7 @@
                                    {
                                        return t;
                                    }};
-    TestingInputProducer producer(server_fd);
+    TestingInputProducer producer(channel.server_fd());
 
     nanoseconds const one_frame = duration_cast<nanoseconds>(1s) / 60;
 
@@ -293,9 +284,9 @@
 {
     bool handler_called = false;
 
-    TestingInputProducer producer(server_fd);
+    TestingInputProducer producer(channel.server_fd());
     mircva::InputReceiver receiver{
-        client_fd,
+        channel.client_fd(),
         std::make_shared<mircv::XKBMapper>(),
         [&handler_called, &producer](MirEvent*)
         {
@@ -322,7 +313,7 @@
 
     int frames_triggered = 0;
 
-    mircva::InputReceiver receiver{client_fd,
+    mircva::InputReceiver receiver{channel.client_fd(),
                                    std::make_shared<mircv::XKBMapper>(),
                                    [&frames_triggered](MirEvent*)
                                    {
@@ -333,7 +324,7 @@
                                    {
                                        return t;
                                    }};
-    TestingInputProducer producer(server_fd);
+    TestingInputProducer producer(channel.server_fd());
 
     std::chrono::nanoseconds const device_sample_interval = duration_cast<nanoseconds>(1s) / 250;
     std::chrono::nanoseconds const frame_interval = duration_cast<nanoseconds>(1s) / 60;
@@ -375,12 +366,12 @@
     std::chrono::nanoseconds t;
 
     mircva::InputReceiver receiver{
-        client_fd,
+        channel.client_fd(),
         std::make_shared<mircv::XKBMapper>(),
         event_handler,
         std::make_shared<mircv::NullInputReceiverReport>(),
     };
-    TestingInputProducer producer(server_fd);
+    TestingInputProducer producer(channel.server_fd());
 
     std::chrono::nanoseconds const one_millisecond = std::chrono::nanoseconds(1000000ULL);
     std::chrono::nanoseconds const one_second = 1000 * one_millisecond;

=== modified file 'tests/unit-tests/input/CMakeLists.txt'
--- tests/unit-tests/input/CMakeLists.txt	2016-03-23 06:39:56 +0000
+++ tests/unit-tests/input/CMakeLists.txt	2016-04-05 21:21:50 +0000
@@ -7,6 +7,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/test_cursor_controller.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_xcursor_loader.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_touchspot_controller.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_input_channel_factory.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_input_event.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_event_builders.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_default_device.cpp

=== modified file 'tests/unit-tests/input/android/CMakeLists.txt'
--- tests/unit-tests/input/android/CMakeLists.txt	2016-03-23 06:39:56 +0000
+++ tests/unit-tests/input/android/CMakeLists.txt	2016-04-05 21:21:50 +0000
@@ -1,6 +1,5 @@
 list(APPEND UNIT_TEST_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/test_android_input_lexicon.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_android_input_channel_factory.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_android_communication_package.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_android_input_sender.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_input_consumer.cpp

=== modified file 'tests/unit-tests/input/android/test_android_communication_package.cpp'
--- tests/unit-tests/input/android/test_android_communication_package.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/input/android/test_android_communication_package.cpp	2016-04-05 21:21:50 +0000
@@ -16,7 +16,7 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "src/server/input/android/android_input_channel.h"
+#include "src/server/input/channel.h"
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -24,14 +24,13 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-namespace droidinput = android;
-namespace mia = mir::input::android;
+namespace mi = mir::input;
 
-TEST(AndroidInputChannel, packages_own_valid_fds)
+TEST(InputChannel, packages_own_valid_fds)
 {
     int server_fd, client_fd;
     {
-        mia::AndroidInputChannel package;
+        mi::Channel package;
 
         server_fd = package.server_fd();
         client_fd = package.client_fd();

=== modified file 'tests/unit-tests/input/android/test_android_input_sender.cpp'
--- tests/unit-tests/input/android/test_android_input_sender.cpp	2016-03-23 06:39:56 +0000
+++ tests/unit-tests/input/android/test_android_input_sender.cpp	2016-04-05 21:21:50 +0000
@@ -18,7 +18,7 @@
 
 #include "mir/events/event_private.h"
 
-#include "src/server/input/android/android_input_channel.h"
+#include "src/server/input/channel.h"
 #include "src/server/input/android/input_sender.h"
 #include "src/server/input/default_event_builder.h"
 #include "src/server/report/null_report_factory.h"
@@ -44,7 +44,6 @@
 
 #include <boost/exception/all.hpp>
 
-//#include <algorithm>
 #include <cstring>
 
 namespace mi = mir::input;
@@ -140,7 +139,7 @@
         fake_scene.observer->surface_removed(&stub_surface);
     }
 
-    std::shared_ptr<mi::InputChannel> channel = std::make_shared<mia::AndroidInputChannel>();
+    std::shared_ptr<mi::InputChannel> channel = std::make_shared<mi::Channel>();
     mtd::StubSceneSurface stub_surface{channel->server_fd()};
     droidinput::sp<droidinput::InputChannel> client_channel{new droidinput::InputChannel(droidinput::String8("test"), channel->client_fd())};
     droidinput::InputConsumer consumer{client_channel};

=== modified file 'tests/unit-tests/input/android/test_input_consumer.cpp'
--- tests/unit-tests/input/android/test_input_consumer.cpp	2016-03-23 06:39:56 +0000
+++ tests/unit-tests/input/android/test_input_consumer.cpp	2016-04-05 21:21:50 +0000
@@ -18,7 +18,7 @@
 
 #include "androidfw/Input.h"
 #include "androidfw/InputTransport.h"
-#include "src/server/input/android/android_input_channel.h"
+#include "src/server/input/channel.h"
 #include "mir/input/android/event_conversion_helpers.h"
 #include "mir/input/android/android_input_lexicon.h"
 #include "mir/geometry/displacement.h"
@@ -32,6 +32,7 @@
 
 using namespace std::literals::chrono_literals;
 namespace mia = mir::input::android;
+namespace mi = mir::input;
 namespace geom = mir::geometry;
 
 namespace
@@ -58,7 +59,7 @@
     mir::cookie::Blob default_cookie;
     EventFactory events;
     std::chrono::milliseconds current_frame_time = 0ms;
-    mia::AndroidInputChannel channel;
+    mi::Channel channel;
     geom::Displacement no_move{0,0};
     geom::Displacement no_scroll{0,0};
     geom::Point origin{0,0};

=== renamed file 'tests/unit-tests/input/android/test_android_input_channel_factory.cpp' => 'tests/unit-tests/input/test_input_channel_factory.cpp'
--- tests/unit-tests/input/android/test_android_input_channel_factory.cpp	2015-06-17 05:20:42 +0000
+++ tests/unit-tests/input/test_input_channel_factory.cpp	2016-04-05 21:21:50 +0000
@@ -16,20 +16,20 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "src/server/input/android/android_input_channel.h"
-#include "src/server/input/android/input_channel_factory.h"
+#include "src/server/input/channel.h"
+#include "src/server/input/channel_factory.h"
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
 #include <initializer_list>
 
-namespace mia = mir::input::android;
+namespace mi = mir::input;
 
-TEST(AndroidInputChannelFactory, channel_factory_returns_input_channel_with_fds)
+TEST(InputChannelFactory, channel_factory_returns_input_channel_with_fds)
 {
-    mia::InputChannelFactory factory;
+    mi::ChannelFactory factory;
 
     auto package = factory.make_input_channel();
-    EXPECT_NE(nullptr, std::dynamic_pointer_cast<mia::AndroidInputChannel>(package));
+    EXPECT_NE(nullptr, std::dynamic_pointer_cast<mi::Channel>(package));
 }