From 59292377d4564ee49087ecb344a4a4802ed706a6 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Fri, 27 Mar 2020 15:14:31 +0000
Subject: [PATCH] Revert "Add new class with APIs of varying visibility"

This reverts commit 7d6704e4b07283b893b8ae07f7e92ad46a7f4187.

The experiment has concluded, and we don't want these APIs in
the finalized R api.

Also update the newly-arrived module txt files.

Bug: 149108482
Test: m checkapi
Change-Id: I965111b9a8ad2d3e5849bd9dfdae9c00cc471ce6
---
 apex/sdkextensions/framework/api/current.txt  |  9 ----
 .../framework/api/module-lib-current.txt      |  8 ---
 .../framework/api/system-current.txt          |  9 ----
 .../java/android/os/ext/test/Test.java        | 53 -------------------
 api/current.txt                               |  9 ----
 api/module-lib-current.txt                    |  8 ---
 api/system-current.txt                        |  9 ----
 7 files changed, 105 deletions(-)
 delete mode 100644 apex/sdkextensions/framework/java/android/os/ext/test/Test.java

diff --git a/apex/sdkextensions/framework/api/current.txt b/apex/sdkextensions/framework/api/current.txt
index 9041262cd07e8..d802177e249b3 100644
--- a/apex/sdkextensions/framework/api/current.txt
+++ b/apex/sdkextensions/framework/api/current.txt
@@ -1,10 +1 @@
 // Signature format: 2.0
-package android.os.ext.test {
-
-  @Deprecated public class Test {
-    ctor @Deprecated public Test();
-    method @Deprecated public void testE();
-  }
-
-}
-
diff --git a/apex/sdkextensions/framework/api/module-lib-current.txt b/apex/sdkextensions/framework/api/module-lib-current.txt
index 494c12f73b000..d802177e249b3 100644
--- a/apex/sdkextensions/framework/api/module-lib-current.txt
+++ b/apex/sdkextensions/framework/api/module-lib-current.txt
@@ -1,9 +1 @@
 // Signature format: 2.0
-package android.os.ext.test {
-
-  @Deprecated public class Test {
-    method @Deprecated public void testD();
-  }
-
-}
-
diff --git a/apex/sdkextensions/framework/api/system-current.txt b/apex/sdkextensions/framework/api/system-current.txt
index 056eb416473fb..bbff4c5ae6f45 100644
--- a/apex/sdkextensions/framework/api/system-current.txt
+++ b/apex/sdkextensions/framework/api/system-current.txt
@@ -7,12 +7,3 @@ package android.os.ext {
 
 }
 
-package android.os.ext.test {
-
-  @Deprecated public class Test {
-    method @Deprecated public void testF();
-    method @Deprecated public void testG();
-  }
-
-}
-
diff --git a/apex/sdkextensions/framework/java/android/os/ext/test/Test.java b/apex/sdkextensions/framework/java/android/os/ext/test/Test.java
deleted file mode 100644
index 1715f498be1ef..0000000000000
--- a/apex/sdkextensions/framework/java/android/os/ext/test/Test.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.os.ext.test;
-
-import android.annotation.SystemApi;
-
-/**
- * This class exists temporarily to verify SDK updates are working properly.
- * @deprecated Do not use.
- */
-@Deprecated
-public class Test {
-
-    public Test() { }
-
-    /** @hide */
-    public void testA() {}
-
-    /** @hide */
-    public void testB() {}
-
-    /** @hide */
-    public void testC() {}
-
-    /** @hide */
-    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
-    public void testD() {}
-
-    public void testE() {}
-
-    /** @hide */
-    @SystemApi
-    public void testF() {}
-
-    /** @hide */
-    @SystemApi
-    public void testG() {}
-
-}
diff --git a/api/current.txt b/api/current.txt
index 2a0e51ca9d9e7..28657f0c35364 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -37193,15 +37193,6 @@ package android.os {
 
 }
 
-package android.os.ext.test {
-
-  @Deprecated public class Test {
-    ctor @Deprecated public Test();
-    method @Deprecated public void testE();
-  }
-
-}
-
 package android.os.health {
 
   public class HealthStats {
diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt
index a1d99670de1c1..e91fe25009b2d 100644
--- a/api/module-lib-current.txt
+++ b/api/module-lib-current.txt
@@ -161,14 +161,6 @@ package android.os {
 
 }
 
-package android.os.ext.test {
-
-  @Deprecated public class Test {
-    method @Deprecated public void testD();
-  }
-
-}
-
 package android.util {
 
   public final class Log {
diff --git a/api/system-current.txt b/api/system-current.txt
index 6d5ba34fdf9f0..f35baeb54a41c 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -8709,15 +8709,6 @@ package android.os.ext {
 
 }
 
-package android.os.ext.test {
-
-  @Deprecated public class Test {
-    method @Deprecated public void testF();
-    method @Deprecated public void testG();
-  }
-
-}
-
 package android.os.image {
 
   public class DynamicSystemClient {