Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-04 18:19:36 +00:00
committed by Android (Google) Code Review
parent 12ef2655f2 af97aef137
commit e34d97f3bf
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistence.java
View File

@@ -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 {
/**

3
apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsState.java
View File

@@ -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 {
/**

3
apex/permission/service/java/com/android/role/persistence/RolesPersistence.java
View File

@@ -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 {
/**

3
apex/permission/service/java/com/android/role/persistence/RolesState.java
View File

@@ -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 {
/**

2
services/Android.bp
View File

@@ -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" +

5
services/core/java/com/android/server/SystemService.java
View File

@@ -23,7 +23,6 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.SystemApi.Client;
import android.annotation.SystemApi.Process;
import android.annotation.UserIdInt;
import android.app.ActivityThread;
import android.content.Context;
@@ -65,7 +64,7 @@ import java.util.List;
*
* {@hide}
*/
@SystemApi(client = Client.MODULE_LIBRARIES, process = Process.SYSTEM_SERVER)
@SystemApi(client = Client.SYSTEM_SERVER)
public abstract class SystemService {
/** @hide */
@@ -132,7 +131,7 @@ public abstract class SystemService {
* Class representing user in question in the lifecycle callbacks.
* @hide
*/
@SystemApi(client = Client.MODULE_LIBRARIES, process = Process.SYSTEM_SERVER)
@SystemApi(client = Client.SYSTEM_SERVER)
public static final class TargetUser {
@NonNull
private final UserInfo mUserInfo;