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

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

Merge "Stop using SystemApi.process per the latest spec"

parents 12ef2655 af97aef1

apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistence.java

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.permission.persistence; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.SystemApi.Client;

import android.os.UserHandle;



/**
@@ -27,7 +28,7 @@ import android.os.UserHandle; 
 * TODO(b/147914847): Remove @hide when it becomes the default.

 * @hide

 */

@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES, process = SystemApi.Process.SYSTEM_SERVER)

@SystemApi(client = Client.SYSTEM_SERVER)

public interface RuntimePermissionsPersistence {



    /**

apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsState.java

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.permission.persistence; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.SystemApi.Client;



import java.util.List;

import java.util.Map;
@@ -29,7 +30,7 @@ import java.util.Map; 
 * TODO(b/147914847): Remove @hide when it becomes the default.

 * @hide

 */

@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES, process = SystemApi.Process.SYSTEM_SERVER)

@SystemApi(client = Client.SYSTEM_SERVER)

public final class RuntimePermissionsState {



    /**

apex/permission/service/java/com/android/role/persistence/RolesPersistence.java

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.role.persistence; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.SystemApi.Client;

import android.os.UserHandle;



/**
@@ -27,7 +28,7 @@ import android.os.UserHandle; 
 * TODO(b/147914847): Remove @hide when it becomes the default.

 * @hide

 */

@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES, process = SystemApi.Process.SYSTEM_SERVER)

@SystemApi(client = Client.SYSTEM_SERVER)

public interface RolesPersistence {



    /**

apex/permission/service/java/com/android/role/persistence/RolesState.java

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.role.persistence; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.SystemApi.Client;



import java.util.Map;

import java.util.Set;
@@ -29,7 +30,7 @@ import java.util.Set; 
 * TODO(b/147914847): Remove @hide when it becomes the default.

 * @hide

 */

@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES, process = SystemApi.Process.SYSTEM_SERVER)

@SystemApi(client = Client.SYSTEM_SERVER)

public final class RolesState {



    /**

services/Android.bp

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

    installable: false,

    // TODO: remove the --hide options below

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

    args: " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.SYSTEM_SERVER\\)" +

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

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

        " --hide ReferencesHidden" +