Snap for 6326486 from 8614bc42980f9310f000b9f4537cc0799a537b2f to mainline-release (ae4d5741) · Commits · e / os / android_frameworks_base

StubLibraries.bp

+1 −5

Original line number	Diff line number	Diff line
		@@ -61,11 +61,7 @@ stubs_defaults {
		merge_annotations_dirs: [
		"metalava-manual",
		],
		api_levels_annotations_enabled: true,
		api_levels_annotations_dirs: [
		"sdk-dir",
		"api-versions-jars-dir",
		],
		api_levels_annotations_enabled: false,
		filter_packages: packages_to_document,
		}

apex/Android.bp

+34 −6

Original line number	Diff line number	Diff line
		@@ -26,8 +26,10 @@ mainline_stubs_args =
		"--hide Typo " +
		"--hide UnavailableSymbol "

		// TODO: remove this server classes are cleaned up.
		mainline_stubs_args += "--hide-package com.android.server "
		// TODO: remove the hiding when server classes are cleaned up.
		mainline_framework_stubs_args =
		mainline_stubs_args +
		"--hide-package com.android.server "

		priv_apps = " " +
		"--show-annotation android.annotation.SystemApi\\(" +
		@@ -39,9 +41,17 @@ module_libs = " " +
		"client=android.annotation.SystemApi.Client.MODULE_LIBRARIES" +
		"\\) "

		mainline_service_stubs_args =
		mainline_stubs_args +
		"--show-annotation android.annotation.SystemApi\\(" +
		"client=android.annotation.SystemApi.Client.SYSTEM_SERVER" +
		"\\) " +
		"--hide-annotation android.annotation.Hide " +
		"--hide InternalClasses " // com.android.* classes are okay in this interface

		stubs_defaults {
		name: "framework-module-stubs-defaults-publicapi",
		args: mainline_stubs_args,
		args: mainline_framework_stubs_args,
		installable: false,
		sdk_version: "current",
		check_api: {
		@@ -54,7 +64,7 @@ stubs_defaults {

		stubs_defaults {
		name: "framework-module-stubs-defaults-systemapi",
		args: mainline_stubs_args + priv_apps,
		args: mainline_framework_stubs_args + priv_apps,
		libs: ["framework-annotations-lib"],
		installable: false,
		sdk_version: "system_current",
		@@ -73,7 +83,7 @@ stubs_defaults {

		stubs_defaults {
		name: "framework-module-api-defaults-module_libs_api",
		args: mainline_stubs_args + module_libs,
		args: mainline_framework_stubs_args + module_libs,
		libs: ["framework-annotations-lib"],
		installable: false,
		sdk_version: "module_current",
		@@ -87,8 +97,26 @@ stubs_defaults {

		stubs_defaults {
		name: "framework-module-stubs-defaults-module_libs_api",
		args: mainline_stubs_args + module_libs + priv_apps,
		args: mainline_framework_stubs_args + module_libs + priv_apps,
		libs: ["framework-annotations-lib"],
		installable: false,
		sdk_version: "module_current",
		}

		stubs_defaults {
		name: "service-module-stubs-srcs-defaults",
		args: mainline_service_stubs_args,
		installable: false,
		check_api: {
		current: {
		api_file: "api/current.txt",
		removed_api_file: "api/removed.txt",
		},
		},
		}

		// Empty for now, but a convenient place to add rules for all
		// module java_library system_server stub libs.
		java_defaults {
		name: "service-module-stubs-defaults",
		}

apex/permission/service/Android.bp

+14 −0

Original line number	Diff line number	Diff line
		@@ -35,3 +35,17 @@ java_library {
		],
		installable: true,
		}

		droidstubs {
		name: "service-permission-stubs-srcs",
		srcs: [ ":service-permission-sources" ],
		defaults: ["service-module-stubs-srcs-defaults"],
		visibility: ["//visibility:private"]
		}

		java_library {
		name: "service-permission-stubs",
		srcs: [":service-permission-stubs-srcs"],
		defaults: ["service-module-stubs-defaults"],
		visibility: ["//visibility:private"]
		}

apex/permission/service/api/current.txt

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		// Signature format: 2.0
		package com.android.permission.persistence {

		public interface RuntimePermissionsPersistence {
		method @NonNull public static com.android.permission.persistence.RuntimePermissionsPersistence createInstance();
		method public void deleteForUser(@NonNull android.os.UserHandle);
		method @Nullable public com.android.permission.persistence.RuntimePermissionsState readForUser(@NonNull android.os.UserHandle);
		method public void writeForUser(@NonNull com.android.permission.persistence.RuntimePermissionsState, @NonNull android.os.UserHandle);
		}

		public final class RuntimePermissionsState {
		ctor public RuntimePermissionsState(int, @Nullable String, @NonNull java.util.Map<java.lang.String,java.util.List<com.android.permission.persistence.RuntimePermissionsState.PermissionState>>, @NonNull java.util.Map<java.lang.String,java.util.List<com.android.permission.persistence.RuntimePermissionsState.PermissionState>>);
		method @Nullable public String getFingerprint();
		method @NonNull public java.util.Map<java.lang.String,java.util.List<com.android.permission.persistence.RuntimePermissionsState.PermissionState>> getPackagePermissions();
		method @NonNull public java.util.Map<java.lang.String,java.util.List<com.android.permission.persistence.RuntimePermissionsState.PermissionState>> getSharedUserPermissions();
		method public int getVersion();
		field public static final int NO_VERSION = -1; // 0xffffffff
		}

		public static final class RuntimePermissionsState.PermissionState {
		ctor public RuntimePermissionsState.PermissionState(@NonNull String, boolean, int);
		method public int getFlags();
		method @NonNull public String getName();
		method public boolean isGranted();
		}

		}

		package com.android.role.persistence {

		public interface RolesPersistence {
		method @NonNull public static com.android.role.persistence.RolesPersistence createInstance();
		method public void deleteForUser(@NonNull android.os.UserHandle);
		method @Nullable public com.android.role.persistence.RolesState readForUser(@NonNull android.os.UserHandle);
		method public void writeForUser(@NonNull com.android.role.persistence.RolesState, @NonNull android.os.UserHandle);
		}

		public final class RolesState {
		ctor public RolesState(int, @Nullable String, @NonNull java.util.Map<java.lang.String,java.util.Set<java.lang.String>>);
		method @Nullable public String getPackagesHash();
		method @NonNull public java.util.Map<java.lang.String,java.util.Set<java.lang.String>> getRoles();
		method public int getVersion();
		}

		}

apex/permission/service/api/removed.txt

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		// Signature format: 2.0