Snap for 8451773 from cdae31b8394c6a32d0e0629f80a8e4f3c4dcb27b to tm-qpr1-release (fc9d147c) · Commits · e / os / android_frameworks_base

api/api.go

+30 −23

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import (
		const art = "art.module.public.api"
		const conscrypt = "conscrypt.module.public.api"
		const i18n = "i18n.module.public.api"

		var core_libraries_modules = []string{art, conscrypt, i18n}

		// The intention behind this soong plugin is to generate a number of "merged"
		@@ -92,6 +93,8 @@ type fgProps struct {
		type MergedTxtDefinition struct {
		// "current.txt" or "removed.txt"
		TxtFilename string
		// Filename in the new dist dir. "android.txt" or "android-removed.txt"
		DistFilename string
		// The module for the non-updatable / non-module part of the api.
		BaseTxt string
		// The list of modules that are relevant for this merged txt.
		@@ -112,7 +115,6 @@ func createMergedTxt(ctx android.LoadHookContext, txt MergedTxtDefinition) {
		if txt.Scope != "public" {
		filename = txt.Scope + "-" + filename
		}

		props := genruleProps{}
		props.Name = proptools.StringPtr(ctx.ModuleName() + "-" + filename)
		props.Tools = []string{"metalava"}
		@@ -126,9 +128,9 @@ func createMergedTxt(ctx android.LoadHookContext, txt MergedTxtDefinition) {
		Dest: proptools.StringPtr(filename),
		},
		{
		Targets: []string{"sdk"},
		Targets: []string{"api_txt", "sdk"},
		Dir: proptools.StringPtr("apistubs/android/" + txt.Scope + "/api"),
		Dest: proptools.StringPtr(txt.TxtFilename),
		Dest: proptools.StringPtr(txt.DistFilename),
		},
		}
		props.Visibility = []string{"//visibility:public"}
		@@ -240,9 +242,11 @@ func createMergedTxts(ctx android.LoadHookContext, bootclasspath, system_server_
		var textFiles []MergedTxtDefinition

		tagSuffix := []string{".api.txt}", ".removed-api.txt}"}
		distFilename := []string{"android.txt", "android-removed.txt"}
		for i, f := range []string{"current.txt", "removed.txt"} {
		textFiles = append(textFiles, MergedTxtDefinition{
		TxtFilename: f,
		DistFilename: distFilename[i],
		BaseTxt: ":non-updatable-" + f,
		Modules: bootclasspath,
		ModuleTag: "{.public" + tagSuffix[i],
		@@ -250,6 +254,7 @@ func createMergedTxts(ctx android.LoadHookContext, bootclasspath, system_server_
		})
		textFiles = append(textFiles, MergedTxtDefinition{
		TxtFilename: f,
		DistFilename: distFilename[i],
		BaseTxt: ":non-updatable-system-" + f,
		Modules: bootclasspath,
		ModuleTag: "{.system" + tagSuffix[i],
		@@ -257,6 +262,7 @@ func createMergedTxts(ctx android.LoadHookContext, bootclasspath, system_server_
		})
		textFiles = append(textFiles, MergedTxtDefinition{
		TxtFilename: f,
		DistFilename: distFilename[i],
		BaseTxt: ":non-updatable-module-lib-" + f,
		Modules: bootclasspath,
		ModuleTag: "{.module-lib" + tagSuffix[i],
		@@ -264,6 +270,7 @@ func createMergedTxts(ctx android.LoadHookContext, bootclasspath, system_server_
		})
		textFiles = append(textFiles, MergedTxtDefinition{
		TxtFilename: f,
		DistFilename: distFilename[i],
		BaseTxt: ":non-updatable-system-server-" + f,
		Modules: system_server_classpath,
		ModuleTag: "{.system-server" + tagSuffix[i],

cmds/telecom/src/com/android/commands/telecom/Telecom.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,8 @@ import com.android.internal.os.BaseCommand;
		import com.android.internal.telecom.ITelecomService;

		import java.io.PrintStream;
		import java.util.Arrays;
		import java.util.stream.Collectors;

		public final class Telecom extends BaseCommand {

		@@ -90,6 +92,10 @@ public final class Telecom extends BaseCommand {
		private static final String COMMAND_GET_MAX_PHONES = "get-max-phones";
		private static final String COMMAND_SET_TEST_EMERGENCY_PHONE_ACCOUNT_PACKAGE_FILTER =
		"set-test-emergency-phone-account-package-filter";
		/**
		* Command used to emit a distinct "mark" in the logs.
		*/
		private static final String COMMAND_LOG_MARK = "log-mark";

		private ComponentName mComponent;
		private String mAccountId;
		@@ -161,6 +167,8 @@ public final class Telecom extends BaseCommand {
		+ " package name that will be used for test emergency calls. To clear,"
		+ " send an empty package name. Real emergency calls will still be placed"
		+ " over Telephony.\n"
		+ "telecom log-mark <MESSAGE>: emits a message into the telecom logs. Useful for "
		+ "testers to indicate where in the logs various test steps take place.\n"
		);
		}

		@@ -265,6 +273,9 @@ public final class Telecom extends BaseCommand {
		case COMMAND_SET_TEST_EMERGENCY_PHONE_ACCOUNT_PACKAGE_FILTER:
		runSetEmergencyPhoneAccountPackageFilter();
		break;
		case COMMAND_LOG_MARK:
		runLogMark();
		break;
		default:
		Log.w(this, "onRun: unknown command: %s", command);
		throw new IllegalArgumentException ("unknown command '" + command + "'");
		@@ -442,6 +453,11 @@ public final class Telecom extends BaseCommand {

		}

		private void runLogMark() throws RemoteException {
		String message = Arrays.stream(mArgs.peekRemainingArgs()).collect(Collectors.joining(" "));
		mTelecomService.requestLogMark(message);
		}

		private PhoneAccountHandle getPhoneAccountHandleFromArgs() throws RemoteException {
		if (TextUtils.isEmpty(mArgs.peekNextArg())) {
		return null;

core/api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -52021,7 +52021,6 @@ package android.view.accessibility {
		method public boolean isSelected();
		method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(int, int, int, int, boolean);
		method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(int, int, int, int, boolean, boolean);
		method @Deprecated @NonNull public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(@Nullable String, int, int, @Nullable String, int, int, boolean, boolean);
		}

		public static final class AccessibilityNodeInfo.CollectionItemInfo.Builder {

core/api/removed.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -525,6 +525,14 @@ package android.view {

		}

		package android.view.accessibility {

		public static final class AccessibilityNodeInfo.CollectionItemInfo {
		method @Deprecated @NonNull public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(@Nullable String, int, int, @Nullable String, int, int, boolean, boolean);
		}

		}

		package android.view.translation {

		public final class TranslationManager {

core/api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -762,7 +762,7 @@ package android.app {
		method public void clearRequireCompatChange();
		method public boolean isPendingIntentBackgroundActivityLaunchAllowed();
		method public static android.app.BroadcastOptions makeBasic();
		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void recordResponseEventWhileInBackground(@IntRange(from=0) long);
		method @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RESPONSE_STATS) public void recordResponseEventWhileInBackground(@IntRange(from=0) long);
		method @RequiresPermission(android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND) public void setBackgroundActivityStartsAllowed(boolean);
		method public void setDontSendToRestrictedApps(boolean);
		method public void setPendingIntentBackgroundActivityLaunchAllowed(boolean);