Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59292377 authored by Anton Hansson's avatar Anton Hansson
Browse files

Revert "Add new class with APIs of varying visibility" 

This reverts commit 7d6704e4.

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
parent f51b6aa5

apex/sdkextensions/framework/api/current.txt

+0 −9
Original line number Diff line number Diff line 
// Signature format: 2.0
 
package android.os.ext.test {



  @Deprecated public class Test {

    ctor @Deprecated public Test();

    method @Deprecated public void testE();

  }



}

apex/sdkextensions/framework/api/module-lib-current.txt

+0 −8
Original line number Diff line number Diff line 
// Signature format: 2.0
 
package android.os.ext.test {



  @Deprecated public class Test {

    method @Deprecated public void testD();

  }



}

apex/sdkextensions/framework/api/system-current.txt

+0 −9
Original line number Diff line number Diff line
@@ -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();

  }



}

apex/sdkextensions/framework/java/android/os/ext/test/Test.java

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line 
/*

 * 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() {}



}

api/current.txt

+0 −9
Original line number Diff line number Diff line
@@ -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 {