diff options
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | framework-s/Android.bp | 44 | ||||
| -rw-r--r-- | framework-s/api/current.txt | 1 | ||||
| -rw-r--r-- | framework-s/api/module-lib-current.txt | 1 | ||||
| -rw-r--r-- | framework-s/api/module-lib-removed.txt | 1 | ||||
| -rw-r--r-- | framework-s/api/removed.txt | 1 | ||||
| -rw-r--r-- | framework-s/api/system-current.txt | 1 | ||||
| -rw-r--r-- | framework-s/api/system-removed.txt | 1 | ||||
| -rw-r--r-- | framework-s/java/android/app/role/RoleFrameworkPlaceholder.java | 26 | ||||
| -rw-r--r-- | framework/Android.bp | 1 |
10 files changed, 78 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index e30df05b2..d839df370 100644 --- a/Android.bp +++ b/Android.bp @@ -26,6 +26,7 @@ apex_defaults { certificate: ":com.android.permission.certificate", java_libs: [ "framework-permission", + "framework-permission-s", "service-permission", ], apps: ["PermissionController"], diff --git a/framework-s/Android.bp b/framework-s/Android.bp new file mode 100644 index 000000000..c621a04ca --- /dev/null +++ b/framework-s/Android.bp @@ -0,0 +1,44 @@ +// Copyright (C) 2021 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. + +filegroup { + name: "framework-permission-s-sources", + srcs: [ + "java/**/*.java", + "java/**/*.aidl", + ], + path: "java", + visibility: ["//frameworks/base"], +} + +java_sdk_library { + name: "framework-permission-s", + defaults: ["framework-module-defaults"], + srcs: [ + ":framework-permission-s-sources", + ], + apex_available: [ + "com.android.permission", + "test_com.android.permission", + ], + hostdex: true, + // Restrict access to implementation library. + impl_library_visibility: ["//frameworks/base/apex/permission:__subpackages__"], + installable: true, + min_sdk_version: "30", + permitted_packages: [ + "android.permission", + "android.app.role", + ], +} diff --git a/framework-s/api/current.txt b/framework-s/api/current.txt new file mode 100644 index 000000000..d802177e2 --- /dev/null +++ b/framework-s/api/current.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/framework-s/api/module-lib-current.txt b/framework-s/api/module-lib-current.txt new file mode 100644 index 000000000..d802177e2 --- /dev/null +++ b/framework-s/api/module-lib-current.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/framework-s/api/module-lib-removed.txt b/framework-s/api/module-lib-removed.txt new file mode 100644 index 000000000..d802177e2 --- /dev/null +++ b/framework-s/api/module-lib-removed.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/framework-s/api/removed.txt b/framework-s/api/removed.txt new file mode 100644 index 000000000..d802177e2 --- /dev/null +++ b/framework-s/api/removed.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/framework-s/api/system-current.txt b/framework-s/api/system-current.txt new file mode 100644 index 000000000..d802177e2 --- /dev/null +++ b/framework-s/api/system-current.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/framework-s/api/system-removed.txt b/framework-s/api/system-removed.txt new file mode 100644 index 000000000..d802177e2 --- /dev/null +++ b/framework-s/api/system-removed.txt @@ -0,0 +1 @@ +// Signature format: 2.0 diff --git a/framework-s/java/android/app/role/RoleFrameworkPlaceholder.java b/framework-s/java/android/app/role/RoleFrameworkPlaceholder.java new file mode 100644 index 000000000..fb7ba3eee --- /dev/null +++ b/framework-s/java/android/app/role/RoleFrameworkPlaceholder.java @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2021 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.app.role; + +/** + * Temporary placeholder class inside framework-permission-s for compilation to pass. + * + * @hide + */ +public class RoleFrameworkPlaceholder { + private RoleFrameworkPlaceholder() {} +} diff --git a/framework/Android.bp b/framework/Android.bp index 36b5decbc..2150cb41f 100644 --- a/framework/Android.bp +++ b/framework/Android.bp @@ -37,6 +37,7 @@ java_sdk_library { "com.android.permission", "test_com.android.permission", ], + min_sdk_version: "30", permitted_packages: [ "android.permission", "android.app.role", |