commit a90ceb3b40e1c51d2725030fd9f0b179b1876647
author Victor Chang <vichang@google.com> Wed Jun 23 17:30:05 2021 +0100
committer Victor Chang <vichang@google.com> Wed Jun 23 20:39:52 2021 +0100
tree 3310ad7c85462974d3a169d8bc944112c9d51d0b
parent 61910670dabdc7b1dc5f4ea7bb54aeaa180e7428

Revert "Refactor StructCapUser{Header,Data} and StructLinger for API review"

This reverts commit 55c5dd09389efe1fa70ffec4187644c8d4ab4b31.

Revert the class rename in master as discussed in http://b/183513856#comment19,
because the API has landed Android S.

Bug: 183513856
Test: m droid
Change-Id: I1461b7b1dc0bd3761658485db0efb52a546c318d

non_openjdk_java_files.bp

diff --git a/non_openjdk_java_files.bp b/non_openjdk_java_files.bp
index 8b67ef7..59a78e3 100755
--- a/non_openjdk_java_files.bp
+++ b/non_openjdk_java_files.bp
@@ -138,6 +138,8 @@
         "luni/src/main/java/android/system/OsConstants.java",
         "luni/src/main/java/android/system/PacketSocketAddress.java",
         "luni/src/main/java/android/system/StructAddrinfo.java",
+        "luni/src/main/java/android/system/StructCapUserData.java",
+        "luni/src/main/java/android/system/StructCapUserHeader.java",
         "luni/src/main/java/android/system/StructCmsghdr.java",
         "luni/src/main/java/android/system/StructGroupReq.java",
         "luni/src/main/java/android/system/StructIfaddrs.java",
@@ -151,8 +153,6 @@
         "luni/src/main/java/android/system/StructTimespec.java",
         "luni/src/main/java/android/system/StructTimeval.java",
         "luni/src/main/java/android/system/StructUcred.java",
-        "luni/src/main/java/android/system/StructUserCapData.java",
-        "luni/src/main/java/android/system/StructUserCapHeader.java",
         "luni/src/main/java/android/system/StructUtsname.java",
         "luni/src/main/java/android/system/UnixSocketAddress.java",
         "luni/src/main/java/android/system/VmSocketAddress.java",