From e546f6816e90faa31385ebc9eabbb04d49368bb2 Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Mon, 8 Jul 2019 17:57:30 -0700
Subject: [PATCH] adb: fdevent: delete FDE_CREATED.

All fdevents must be created by fdevent_create/fdevent_context::Create
now, so this flag is meaningless.

Test: none
Change-Id: I8489afad07bdb267ddfdb0dbb25d40d3a62f55f6
---
 adb/fdevent/fdevent.cpp      | 3 ---
 adb/fdevent/fdevent.h        | 1 -
 adb/fdevent/fdevent_poll.cpp | 5 -----
 3 files changed, 9 deletions(-)

diff --git a/adb/fdevent/fdevent.cpp b/adb/fdevent/fdevent.cpp
index c858f6be4..d6e3a660d 100644
--- a/adb/fdevent/fdevent.cpp
+++ b/adb/fdevent/fdevent.cpp
@@ -33,9 +33,6 @@ std::string dump_fde(const fdevent* fde) {
     if (fde->state & FDE_PENDING) {
         state += "P";
     }
-    if (fde->state & FDE_CREATED) {
-        state += "C";
-    }
     if (fde->state & FDE_READ) {
         state += "R";
     }
diff --git a/adb/fdevent/fdevent.h b/adb/fdevent/fdevent.h
index 5a2f2c63f..0147ad5d6 100644
--- a/adb/fdevent/fdevent.h
+++ b/adb/fdevent/fdevent.h
@@ -43,7 +43,6 @@
 
 #define FDE_ACTIVE     0x0100
 #define FDE_PENDING    0x0200
-#define FDE_CREATED    0x0400
 
 typedef void (*fd_func)(int fd, unsigned events, void *userdata);
 typedef void (*fd_func2)(struct fdevent* fde, unsigned events, void* userdata);
diff --git a/adb/fdevent/fdevent_poll.cpp b/adb/fdevent/fdevent_poll.cpp
index 7615859dc..f7863379c 100644
--- a/adb/fdevent/fdevent_poll.cpp
+++ b/adb/fdevent/fdevent_poll.cpp
@@ -105,7 +105,6 @@ fdevent* fdevent_context_poll::Create(unique_fd fd, std::variant<fd_func, fd_fun
     auto pair = poll_node_map_.emplace(fde->fd.get(), PollNode(fde));
     CHECK(pair.second) << "install existing fd " << fde->fd.get();
 
-    fde->state |= FDE_CREATED;
     return fde;
 }
 
@@ -115,10 +114,6 @@ unique_fd fdevent_context_poll::Destroy(fdevent* fde) {
         return {};
     }
 
-    if (!(fde->state & FDE_CREATED)) {
-        LOG(FATAL) << "destroying fde not created by fdevent_create(): " << dump_fde(fde);
-    }
-
     unique_fd result = std::move(fde->fd);
     if (fde->state & FDE_ACTIVE) {
         poll_node_map_.erase(result.get());