Merge "Expose TestAPIs needed by GtsOsTestCases" into pi-dev (d565f049) · Commits · e / os / android_frameworks_base

api/test-current.txt

+21 −0

Original line number	Diff line number	Diff line
		@@ -245,6 +245,8 @@ package android.content.pm {
		method public abstract int getInstallReason(java.lang.String, android.os.UserHandle);
		method public abstract java.lang.String[] getNamesForUids(int[]);
		method public abstract java.lang.String getPermissionControllerPackageName();
		method public abstract java.lang.String getServicesSystemSharedLibraryPackageName();
		method public abstract java.lang.String getSharedSystemSharedLibraryPackageName();
		method public abstract boolean isPermissionReviewModeEnabled();
		field public static final java.lang.String FEATURE_ADOPTABLE_STORAGE = "android.software.adoptable_storage";
		field public static final java.lang.String FEATURE_FILE_BASED_ENCRYPTION = "android.software.file_based_encryption";
		@@ -465,6 +467,10 @@ package android.location {
		method public void setType(int);
		}

		public class LocationManager {
		method public java.lang.String[] getBackgroundThrottlingWhitelist();
		}

		}

		package android.media {
		@@ -544,6 +550,15 @@ package android.os {
		field public static final int RESOURCES_SDK_INT;
		}

		public class DeviceIdleManager {
		method public java.lang.String[] getSystemPowerWhitelist();
		method public java.lang.String[] getSystemPowerWhitelistExceptIdle();
		}

		public class Environment {
		method public static java.io.File buildPath(java.io.File, java.lang.String...);
		}

		public class IncidentManager {
		method public void reportIncident(android.os.IncidentReportArgs);
		}
		@@ -611,12 +626,18 @@ package android.os {
		method public abstract void log(android.os.StrictMode.ViolationInfo);
		}

		public class SystemProperties {
		method public static java.lang.String get(java.lang.String, java.lang.String);
		}

		public final class UserHandle implements android.os.Parcelable {
		method public static int getAppId(int);
		method public int getIdentifier();
		field public static final android.os.UserHandle SYSTEM;
		}

		public class UserManager {
		method public static boolean isSplitSystemUser();
		field public static final java.lang.String ACTION_USER_RESTRICTIONS_CHANGED = "android.os.action.USER_RESTRICTIONS_CHANGED";
		}

config/hiddenapi-light-greylist.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -1512,7 +1512,6 @@ Landroid/os/UserHandle;-><init>(I)V
		Landroid/os/UserHandle;->MU_ENABLED:Z
		Landroid/os/UserHandle;->OWNER:Landroid/os/UserHandle;
		Landroid/os/UserHandle;->PER_USER_RANGE:I
		Landroid/os/UserHandle;->SYSTEM:Landroid/os/UserHandle;
		Landroid/os/UserHandle;->USER_ALL:I
		Landroid/os/UserHandle;->USER_CURRENT:I
		Landroid/os/UserHandle;->USER_CURRENT_OR_SELF:I

core/java/android/app/SystemServiceRegistry.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -105,10 +105,12 @@ import android.nfc.NfcManager;
		import android.os.BatteryManager;
		import android.os.BatteryStats;
		import android.os.Build;
		import android.os.DeviceIdleManager;
		import android.os.DropBoxManager;
		import android.os.HardwarePropertiesManager;
		import android.os.IBatteryPropertiesRegistrar;
		import android.os.IBinder;
		import android.os.IDeviceIdleController;
		import android.os.IHardwarePropertiesManager;
		import android.os.IPowerManager;
		import android.os.IRecoverySystem;
		@@ -984,6 +986,17 @@ final class SystemServiceRegistry {
		ctx.mMainThread.getHandler());
		}
		});

		registerService(Context.DEVICE_IDLE_CONTROLLER, DeviceIdleManager.class,
		new CachedServiceFetcher<DeviceIdleManager>() {
		@Override
		public DeviceIdleManager createService(ContextImpl ctx)
		throws ServiceNotFoundException {
		IDeviceIdleController service = IDeviceIdleController.Stub.asInterface(
		ServiceManager.getServiceOrThrow(
		Context.DEVICE_IDLE_CONTROLLER));
		return new DeviceIdleManager(ctx.getOuterContext(), service);
		}});
		}

		/**

core/java/android/content/Context.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3780,7 +3780,7 @@ public abstract class Context {
		public static final String DROPBOX_SERVICE = "dropbox";

		/**
		* System service name for the DeviceIdleController. There is no Java API for this.
		* System service name for the DeviceIdleManager.
		* @see #getSystemService(String)
		* @hide
		*/

core/java/android/content/pm/PackageManager.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -3952,6 +3952,7 @@ public abstract class PackageManager {
		*
		* @hide
		*/
		@TestApi
		public abstract @NonNull String getServicesSystemSharedLibraryPackageName();

		/**
		@@ -3961,6 +3962,7 @@ public abstract class PackageManager {
		*
		* @hide
		*/
		@TestApi
		public abstract @NonNull String getSharedSystemSharedLibraryPackageName();

		/**