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

Commit 86c09b2d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I4af73809,Iba6a564a 

* changes:
  Hide com.android.server package with @hide javadoc tag
  Add more enums for the client and process attributes of SystemApi
parents 51247634 5141f379

core/java/android/annotation/SystemApi.java

+21 −1
Original line number Diff line number Diff line
@@ -44,9 +44,24 @@ public @interface SystemApi { 
    enum Client {

        /**

         * Specifies that the intended clients of a SystemApi are privileged apps.

         * This is the default value for {@link #client}.

         * This is the default value for {@link #client}. This implies

         * MODULE_APPS and MODULE_LIBRARIES as well, which means that APIs will also

         * be available to module apps and jars.

         */

        PRIVILEGED_APPS,



        /**

         * Specifies that the intended clients of a SystemApi are modules implemented

         * as apps, like the NetworkStack app. This implies MODULE_LIBRARIES as well,

         * which means that APIs will also be available to module jars.

         */

        MODULE_APPS,



        /**

         * Specifies that the intended clients of a SystemApi are modules implemented

         * as libraries, like the conscrypt.jar in the conscrypt APEX.

         */

        MODULE_LIBRARIES

    }



    enum Process {
@@ -55,6 +70,11 @@ public @interface SystemApi { 
         * This is the default value for {@link #process}.

         */

        ALL,



        /**

         * Specifies that the SystemAPI is available only in the system server process.

         */

        SYSTEM_SERVER

    }



    /**

services/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ droidstubs { 
    srcs: [":services-sources"],

    installable: false,

    // TODO: remove the --hide options below

    args: " --show-single-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.INTERNAL,process=android.annotation.SystemApi.Process.SYSTEM_SERVER\\)" +

    args: " --show-single-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES,process=android.annotation.SystemApi.Process.SYSTEM_SERVER\\)" +

        " --hide-annotation android.annotation.Hide" +

        " --hide-package com.google.android.startop.iorap" +

        " --hide ReferencesHidden" +

services/core/java/com/android/server/package-info.java

+5 −0
Original line number Diff line number Diff line
@@ -13,5 +13,10 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



/**

 * @hide

 * TODO(b/146466118) remove this javadoc tag

 */

@android.annotation.Hide

package com.android.server;