From af97aef13751f43805b01d0684ee90f5524c07ee Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Mon, 3 Feb 2020 10:32:52 -0800 Subject: [PATCH] Stop using SystemApi.process per the latest spec Bug: 148177503 Test: Build / treehugger Change-Id: If656b2faa2e031775ef1fc4e9bfaeb170db55620 --- .../persistence/RuntimePermissionsPersistence.java | 3 ++- .../permission/persistence/RuntimePermissionsState.java | 3 ++- .../java/com/android/role/persistence/RolesPersistence.java | 3 ++- .../java/com/android/role/persistence/RolesState.java | 3 ++- services/Android.bp | 2 +- services/core/java/com/android/server/SystemService.java | 5 ++--- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistence.java b/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistence.java index 5f2d94441965e..6c7f82a119085 100644 --- a/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistence.java +++ b/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsPersistence.java @@ -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 { /** diff --git a/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsState.java b/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsState.java index 2a939e51b98e8..cd2750a0bee51 100644 --- a/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsState.java +++ b/apex/permission/service/java/com/android/permission/persistence/RuntimePermissionsState.java @@ -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 { /** diff --git a/apex/permission/service/java/com/android/role/persistence/RolesPersistence.java b/apex/permission/service/java/com/android/role/persistence/RolesPersistence.java index 63c8eedd62856..2908a3872df9d 100644 --- a/apex/permission/service/java/com/android/role/persistence/RolesPersistence.java +++ b/apex/permission/service/java/com/android/role/persistence/RolesPersistence.java @@ -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 { /** diff --git a/apex/permission/service/java/com/android/role/persistence/RolesState.java b/apex/permission/service/java/com/android/role/persistence/RolesState.java index bff980e2e126a..7da9d11f172f0 100644 --- a/apex/permission/service/java/com/android/role/persistence/RolesState.java +++ b/apex/permission/service/java/com/android/role/persistence/RolesState.java @@ -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 { /** diff --git a/services/Android.bp b/services/Android.bp index a582453619397..28c8aeea4e531 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -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" + diff --git a/services/core/java/com/android/server/SystemService.java b/services/core/java/com/android/server/SystemService.java index b1584fea90c10..e3c7325232643 100644 --- a/services/core/java/com/android/server/SystemService.java +++ b/services/core/java/com/android/server/SystemService.java @@ -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;