Snap for 10082380 from dd0c111bf83c6151ed392c6edbead4accb610918 to udc-qpr1-release (662fc038) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -2367,6 +2367,7 @@ package android.os {
		method public static boolean isApp(int);
		field public static final int MIN_SECONDARY_USER_ID = 10; // 0xa
		field public static final int USER_ALL = -1; // 0xffffffff
		field public static final int USER_CURRENT = -2; // 0xfffffffe
		field public static final int USER_NULL = -10000; // 0xffffd8f0
		field public static final int USER_SYSTEM = 0; // 0x0
		}
		@@ -2375,10 +2376,12 @@ package android.os {
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createProfileForUser(@Nullable String, @NonNull String, int, int, @Nullable String[]);
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createRestrictedProfile(@Nullable String);
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createUser(@Nullable String, @NonNull String, int);
		method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.List<android.content.pm.UserInfo> getAliveUsers();
		method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.os.UserHandle getBootUser();
		method public int getMainDisplayIdAssignedToUser();
		method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.Set<java.lang.String> getPreInstallableSystemPackages(@NonNull String);
		method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS, android.Manifest.permission.QUERY_USERS}) public String getUserType();
		method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.List<android.content.pm.UserInfo> getUsers();
		method @Deprecated @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.List<android.content.pm.UserInfo> getUsers(boolean, boolean, boolean);
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean hasBaseUserRestriction(@NonNull String, @NonNull android.os.UserHandle);
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean isUserTypeEnabled(@NonNull String);

core/java/android/content/pm/LauncherApps.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -765,10 +765,6 @@ public class LauncherApps {
		@Nullable
		public PendingIntent getMainActivityLaunchIntent(@NonNull ComponentName component,
		@Nullable Bundle startActivityOptions, @NonNull UserHandle user) {
		if (mContext.checkSelfPermission(android.Manifest.permission.START_TASKS_FROM_RECENTS)
		!= PackageManager.PERMISSION_GRANTED) {
		Log.w(TAG, "Only allowed for recents.");
		}
		logErrorForInvalidProfileAccess(user);
		if (DEBUG) {
		Log.i(TAG, "GetMainActivityLaunchIntent " + component + " " + user);

core/java/android/credentials/ui/RequestInfo.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,12 @@ public final class RequestInfo implements Parcelable {
		@NonNull public static final String TYPE_UNDEFINED = "android.credentials.ui.TYPE_UNDEFINED";
		/** Type value for a getCredential request. */
		@NonNull public static final String TYPE_GET = "android.credentials.ui.TYPE_GET";
		/** Type value for a getCredential request that utilizes the credential registry.
		*
		* @hide
		**/
		@NonNull public static final String TYPE_GET_VIA_REGISTRY =
		"android.credentials.ui.TYPE_GET_VIA_REGISTRY";
		/** Type value for a createCredential request. */
		@NonNull public static final String TYPE_CREATE = "android.credentials.ui.TYPE_CREATE";

core/java/android/hardware/radio/TunerCallbackAdapter.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -144,6 +144,9 @@ final class TunerCallbackAdapter extends ITunerCallback.Stub {

		int errorCode;
		switch (status) {
		case RadioTuner.TUNER_RESULT_CANCELED:
		errorCode = RadioTuner.ERROR_CANCELLED;
		break;
		case RadioManager.STATUS_PERMISSION_DENIED:
		case RadioManager.STATUS_DEAD_OBJECT:
		errorCode = RadioTuner.ERROR_SERVER_DIED;
		@@ -152,10 +155,16 @@ final class TunerCallbackAdapter extends ITunerCallback.Stub {
		case RadioManager.STATUS_NO_INIT:
		case RadioManager.STATUS_BAD_VALUE:
		case RadioManager.STATUS_INVALID_OPERATION:
		case RadioTuner.TUNER_RESULT_INTERNAL_ERROR:
		case RadioTuner.TUNER_RESULT_INVALID_ARGUMENTS:
		case RadioTuner.TUNER_RESULT_INVALID_STATE:
		case RadioTuner.TUNER_RESULT_NOT_SUPPORTED:
		case RadioTuner.TUNER_RESULT_UNKNOWN_ERROR:
		Log.i(TAG, "Got an error with no mapping to the legacy API (" + status
		+ "), doing a best-effort conversion to ERROR_SCAN_TIMEOUT");
		// fall through
		case RadioManager.STATUS_TIMED_OUT:
		case RadioTuner.TUNER_RESULT_TIMEOUT:
		default:
		errorCode = RadioTuner.ERROR_SCAN_TIMEOUT;
		}

core/java/android/os/UserHandle.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ public final class UserHandle implements Parcelable {

		/** @hide A user id to indicate the currently active user */
		@UnsupportedAppUsage
		@TestApi
		public static final @UserIdInt int USER_CURRENT = -2;

		/** @hide A user handle to indicate the current user of the device */