commit e025438a0339bd89662a7c7fac49299ad7143380
author android-build-prod (mdb) <android-build-team-robot@google.com> Fri Nov 17 00:34:01 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 17 00:34:01 2017 +0000
tree 19d2082c959f0fffe1039d3876ee79d5c0e2bd15
parent f40e59e7fdff2ec7f273357f935e1cbb374f5f4b
parent c91fbb53992bbef87af4e59ddfbdb5b51862da62

Merge "Snap for 4455664 from 30fdd01f2e69f8235dafe4cb2fef2577d48458f3 to oreo-vts-release" into oreo-vts-release

include/android/keycodes.h

diff --git a/include/android/keycodes.h b/include/android/keycodes.h
index 2164d61..e202060 100644
--- a/include/android/keycodes.h
+++ b/include/android/keycodes.h
@@ -765,9 +765,7 @@
     /** fingerprint navigation key, left. */
     AKEYCODE_SYSTEM_NAVIGATION_LEFT = 282,
     /** fingerprint navigation key, right. */
-    AKEYCODE_SYSTEM_NAVIGATION_RIGHT = 283,
-    /** all apps */
-    AKEYCODE_ALL_APPS = 284
+    AKEYCODE_SYSTEM_NAVIGATION_RIGHT = 283
 
     // NOTE: If you add a new keycode here you must also add it to several other files.
     //       Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.

include/input/InputEventLabels.h

diff --git a/include/input/InputEventLabels.h b/include/input/InputEventLabels.h
index c282cf0..20154eb 100644
--- a/include/input/InputEventLabels.h
+++ b/include/input/InputEventLabels.h
@@ -323,7 +323,6 @@
     DEFINE_KEYCODE(SYSTEM_NAVIGATION_DOWN),
     DEFINE_KEYCODE(SYSTEM_NAVIGATION_LEFT),
     DEFINE_KEYCODE(SYSTEM_NAVIGATION_RIGHT),
-    DEFINE_KEYCODE(ALL_APPS),
 
     { NULL, 0 }
 };

libs/binder/tests/Android.bp

diff --git a/libs/binder/tests/Android.bp b/libs/binder/tests/Android.bp
index 3071408..853ca16 100644
--- a/libs/binder/tests/Android.bp
+++ b/libs/binder/tests/Android.bp
@@ -15,13 +15,6 @@
 //
 
 cc_test {
-    name: "binderDriverInterfaceTest_IPC_32",
-    srcs: ["binderDriverInterfaceTest.cpp"],
-    compile_multilib: "32",
-    cflags: ["-DBINDER_IPC_32BIT=1"],
-}
-
-cc_test {
     product_variables: {
         binder32bit: {
             cflags: ["-DBINDER_IPC_32BIT=1"],
@@ -42,23 +35,6 @@
 }
 
 cc_test {
-    name: "binderLibTest_IPC_32",
-    srcs: ["binderLibTest.cpp"],
-    shared_libs: [
-        "libbinder",
-        "libutils",
-    ],
-    compile_multilib: "32",
-    cflags: ["-DBINDER_IPC_32BIT=1"],
-}
-
-cc_test {
-    product_variables: {
-        binder32bit: {
-            cflags: ["-DBINDER_IPC_32BIT=1"],
-        },
-    },
-
     name: "binderLibTest",
     srcs: ["binderLibTest.cpp"],
     shared_libs: [

libs/binder/tests/binderLibTest.cpp

diff --git a/libs/binder/tests/binderLibTest.cpp b/libs/binder/tests/binderLibTest.cpp
index a04869a..757291c 100644
--- a/libs/binder/tests/binderLibTest.cpp
+++ b/libs/binder/tests/binderLibTest.cpp
@@ -681,10 +681,10 @@
 
     const flat_binder_object *fb = reply.readObject(false);
     ASSERT_TRUE(fb != NULL);
-    EXPECT_EQ(BINDER_TYPE_HANDLE, fb->type);
-    EXPECT_EQ(m_server, ProcessState::self()->getStrongProxyForHandle(fb->handle));
-    EXPECT_EQ((binder_uintptr_t)0, fb->cookie);
-    EXPECT_EQ((uint64_t)0, (uint64_t)fb->binder >> 32);
+    EXPECT_EQ(fb->type, BINDER_TYPE_HANDLE);
+    EXPECT_EQ(ProcessState::self()->getStrongProxyForHandle(fb->handle), m_server);
+    EXPECT_EQ(fb->cookie, (binder_uintptr_t)0);
+    EXPECT_EQ(fb->binder >> 32, (binder_uintptr_t)0);
 }
 
 TEST_F(BinderLibTest, FreedBinder) {