Merge "Remove non-updatable-* prefix from .txt files" into sc-dev (1d995bb5) · Commits · e / os / android_frameworks_base

services/Android.bp

+3 −3

Original line number	Diff line number	Diff line
		@@ -190,13 +190,13 @@ droidstubs {
		defaults: ["services-stubs-default"],
		check_api: {
		current: {
		api_file: "api/non-updatable-current.txt",
		removed_api_file: "api/non-updatable-removed.txt",
		api_file: "api/current.txt",
		removed_api_file: "api/removed.txt",
		},
		api_lint: {
		enabled: true,
		new_since: ":android-non-updatable.api.system-server.latest",
		baseline_file: "api/non-updatable-lint-baseline.txt",
		baseline_file: "api/lint-baseline.txt",
		},
		},
		dists: [

services/api/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -24,12 +24,12 @@ package {

		filegroup {
		name: "non-updatable-system-server-current.txt",
		srcs: ["non-updatable-current.txt"],
		srcs: ["current.txt"],
		visibility: ["//frameworks/base/api"],
		}

		filegroup {
		name: "non-updatable-system-server-removed.txt",
		srcs: ["non-updatable-removed.txt"],
		srcs: ["removed.txt"],
		visibility: ["//frameworks/base/api"],
		}

services/api/current.txt

+0 −53

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 {

		public interface RoleManagerLocal {
		method @NonNull public java.util.Map<java.lang.String,java.util.Set<java.lang.String>> getRolesAndHolders(int);
		}

		}

		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();
		}

		}

		package com.android.server {

		public final class LocalManagerRegistry {

services/api/lint-baseline.txt

+4 −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):

services/api/non-updatable-current.txt

deleted100644 → 0

+0 −71

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

		public final class LocalManagerRegistry {
		method public static <T> void addManager(@NonNull Class<T>, @NonNull T);
		method @Nullable public static <T> T getManager(@NonNull Class<T>);
		}

		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.am {

		public interface ActivityManagerLocal {
		method public boolean canStartForegroundService(int, int, @NonNull String);
		}

		}

		package com.android.server.role {

		public interface RoleServicePlatformHelper {
		method @NonNull public String computePackageStateHash(int);
		method @NonNull public java.util.Map<java.lang.String,java.util.Set<java.lang.String>> getLegacyRoleState(int);
		}

		}

		package com.android.server.stats {

		public final class StatsHelper {
		method public static void sendStatsdReadyBroadcast(@NonNull android.content.Context);
		}

		}

		package com.android.server.wifi {

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

		}