From 9a285e79f3b89c2a1bb7f536fde626cc58c2d963 Mon Sep 17 00:00:00 2001
From: Victor Chang <vichang@google.com>
Date: Wed, 23 Jun 2021 17:22:01 +0100
Subject: [PATCH] Revert "Refactor StructCapUser{Header,Data} and StructLinger
 for API review"

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

This reverts the commit fa36bdff9f1e6821b10b99a59c454abf421dd7a6

Bug: 183513856
Test: m droid
Change-Id: I38bd8b7a9dad85d993dd432ab8f72995a23550fc
---
 core/java/com/android/internal/os/WrapperInit.java | 12 ++++++------
 core/java/com/android/internal/os/ZygoteInit.java  |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/java/com/android/internal/os/WrapperInit.java b/core/java/com/android/internal/os/WrapperInit.java
index 508782b9f3dcf..6860759eea8ae 100644
--- a/core/java/com/android/internal/os/WrapperInit.java
+++ b/core/java/com/android/internal/os/WrapperInit.java
@@ -21,8 +21,8 @@ import android.os.Trace;
 import android.system.ErrnoException;
 import android.system.Os;
 import android.system.OsConstants;
-import android.system.StructUserCapData;
-import android.system.StructUserCapHeader;
+import android.system.StructCapUserData;
+import android.system.StructCapUserHeader;
 import android.util.Slog;
 import android.util.TimingsTraceLog;
 
@@ -187,9 +187,9 @@ public class WrapperInit {
      *       capabilities, which may make it crash, but not exceed its allowances.
      */
     private static void preserveCapabilities() {
-        StructUserCapHeader header = new StructUserCapHeader(
+        StructCapUserHeader header = new StructCapUserHeader(
                 OsConstants._LINUX_CAPABILITY_VERSION_3, 0);
-        StructUserCapData[] data;
+        StructCapUserData[] data;
         try {
             data = Os.capget(header);
         } catch (ErrnoException e) {
@@ -199,9 +199,9 @@ public class WrapperInit {
 
         if (data[0].permitted != data[0].inheritable ||
                 data[1].permitted != data[1].inheritable) {
-            data[0] = new StructUserCapData(data[0].effective, data[0].permitted,
+            data[0] = new StructCapUserData(data[0].effective, data[0].permitted,
                     data[0].permitted);
-            data[1] = new StructUserCapData(data[1].effective, data[1].permitted,
+            data[1] = new StructCapUserData(data[1].effective, data[1].permitted,
                     data[1].permitted);
             try {
                 Os.capset(header, data);
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index cb6008bfa9615..a9e8fbce91872 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -45,8 +45,8 @@ import android.security.keystore2.AndroidKeyStoreProvider;
 import android.system.ErrnoException;
 import android.system.Os;
 import android.system.OsConstants;
-import android.system.StructUserCapData;
-import android.system.StructUserCapHeader;
+import android.system.StructCapUserData;
+import android.system.StructCapUserHeader;
 import android.text.Hyphenator;
 import android.util.EventLog;
 import android.util.Log;
@@ -750,9 +750,9 @@ public class ZygoteInit {
                 OsConstants.CAP_BLOCK_SUSPEND
         );
         /* Containers run without some capabilities, so drop any caps that are not available. */
-        StructUserCapHeader header = new StructUserCapHeader(
+        StructCapUserHeader header = new StructCapUserHeader(
                 OsConstants._LINUX_CAPABILITY_VERSION_3, 0);
-        StructUserCapData[] data;
+        StructCapUserData[] data;
         try {
             data = Os.capget(header);
         } catch (ErrnoException ex) {