Merge "Create non updatable system server stubs" am: 359eca32b3 (a03cf88e) · Commits · e / os / android_frameworks_base

services/Android.bp

+49 −5

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ filegroup {
		}

		filegroup {
		name: "services-all-sources",
		name: "services-non-updatable-sources",
		srcs: [
		":services.core-sources",
		":services.accessibility-sources",
		@@ -47,6 +47,14 @@ filegroup {
		":services.usb-sources",
		":services.voiceinteraction-sources",
		":services.wifi-sources",
		],
		visibility: ["//visibility:private"],
		}

		filegroup {
		name: "services-all-sources",
		srcs: [
		":services-non-updatable-sources",
		":service-permission-sources",
		":service-statsd-sources",
		],
		@@ -127,9 +135,8 @@ filegroup {
		// API stub
		// =============================================================

		droidstubs {
		name: "services-stubs.sources",
		srcs: [":services-all-sources"],
		stubs_defaults {
		name: "services-stubs-default",
		installable: false,
		args: " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.SYSTEM_SERVER\\)" +
		" --hide-annotation android.annotation.Hide" +
		@@ -139,7 +146,13 @@ droidstubs {
		" --hide DeprecationMismatch" +
		" --hide HiddenTypedefConstant",
		visibility: ["//visibility:private"],
		filter_packages: ["com.android."],
		filter_packages: ["com.android."]
		}

		droidstubs {
		name: "services-stubs.sources",
		srcs: [":services-all-sources"],
		defaults: ["services-stubs-default"],
		check_api: {
		current: {
		api_file: "api/current.txt",
		@@ -185,3 +198,34 @@ java_library {
		dir: "apistubs/android/system-server",
		},
		}

		droidstubs {
		name: "services-non-updatable-stubs.sources",
		srcs: [":services-non-updatable-sources"],
		defaults: ["services-stubs-default"],
		check_api: {
		current: {
		api_file: "api/non-updatable-current.txt",
		removed_api_file: "api/non-updatable-removed.txt",
		},
		api_lint: {
		enabled: true,
		new_since: ":android-non-updatable.api.system-server.latest",
		baseline_file: "api/non-updatable-lint-baseline.txt",
		},
		},
		dists: [
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/system-server/api",
		dest: "android-non-updatable.txt",
		tag: ".api.txt"
		},
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/system-server/api",
		dest: "android-non-updatable-removed.tx",
		tag: ".removed-api.txt",
		},
		]
		}
		No newline at end of file

services/api/non-updatable-current.txt

0 → 100644

+41 −0

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

		public abstract class SystemService {
		ctor public SystemService(@NonNull android.content.Context);
		method @NonNull public final android.content.Context getContext();
		method public boolean isUserSupported(@NonNull com.android.server.SystemService.TargetUser);
		method public void onBootPhase(int);
		method public abstract void onStart();
		method public void onUserStarting(@NonNull com.android.server.SystemService.TargetUser);
		method public void onUserStopped(@NonNull com.android.server.SystemService.TargetUser);
		method public void onUserStopping(@NonNull com.android.server.SystemService.TargetUser);
		method public void onUserSwitching(@Nullable com.android.server.SystemService.TargetUser, @NonNull com.android.server.SystemService.TargetUser);
		method public void onUserUnlocked(@NonNull com.android.server.SystemService.TargetUser);
		method public void onUserUnlocking(@NonNull com.android.server.SystemService.TargetUser);
		method protected final void publishBinderService(@NonNull String, @NonNull android.os.IBinder);
		method protected final void publishBinderService(@NonNull String, @NonNull android.os.IBinder, boolean);
		field public static final int PHASE_ACTIVITY_MANAGER_READY = 550; // 0x226
		field public static final int PHASE_BOOT_COMPLETED = 1000; // 0x3e8
		field public static final int PHASE_DEVICE_SPECIFIC_SERVICES_READY = 520; // 0x208
		field public static final int PHASE_LOCK_SETTINGS_READY = 480; // 0x1e0
		field public static final int PHASE_SYSTEM_SERVICES_READY = 500; // 0x1f4
		field public static final int PHASE_THIRD_PARTY_APPS_CAN_START = 600; // 0x258
		field public static final int PHASE_WAIT_FOR_DEFAULT_DISPLAY = 100; // 0x64
		}

		public static final class SystemService.TargetUser {
		method @NonNull public android.os.UserHandle getUserHandle();
		}

		}

		package com.android.server.wifi {

		public class SupplicantManager {
		method public static void start();
		method public static void stop();
		}

		}

services/api/non-updatable-lint-baseline.txt

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		// Baseline format: 1.0
		NotCloseable: com.android.server.wifi.SupplicantManager:
		Classes that release resources (stop()) should implement AutoClosable and CloseGuard: class com.android.server.wifi.SupplicantManager


		ProtectedMember: com.android.server.SystemService#publishBinderService(String, android.os.IBinder):
		Protected methods not allowed; must be public: method com.android.server.SystemService.publishBinderService(String,android.os.IBinder)}
		ProtectedMember: com.android.server.SystemService#publishBinderService(String, android.os.IBinder, boolean):
		Protected methods not allowed; must be public: method com.android.server.SystemService.publishBinderService(String,android.os.IBinder,boolean)}

services/api/non-updatable-removed.txt

0 → 100644

+1 −0

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