Snap for 8677352 from 1b076a41fd19c1f6f37fd729fe1823c453f09695 to tm-qpr1-release (1f877b57) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/InputMethodService.java

+14 −5

Original line number	Diff line number	Diff line
		@@ -806,11 +806,6 @@ public class InputMethodService extends AbstractInputMethodService {
		@NonNull EditorInfo editorInfo, boolean restarting,
		@NonNull IBinder startInputToken, @InputMethodNavButtonFlags int navButtonFlags,
		@NonNull ImeOnBackInvokedDispatcher imeDispatcher) {
		mImeDispatcher = imeDispatcher;
		if (mWindow != null) {
		mWindow.getOnBackInvokedDispatcher().setImeOnBackInvokedDispatcher(
		imeDispatcher);
		}
		mPrivOps.reportStartInputAsync(startInputToken);
		mNavigationBarController.onNavButtonFlagsChanged(navButtonFlags);
		if (restarting) {
		@@ -818,6 +813,15 @@ public class InputMethodService extends AbstractInputMethodService {
		} else {
		startInput(inputConnection, editorInfo);
		}
		// Update the IME dispatcher last, so that the previously registered back callback
		// (if any) can be unregistered using the old dispatcher if {@link #doFinishInput()}
		// is called from {@link #startInput(InputConnection, EditorInfo)} or
		// {@link #restartInput(InputConnection, EditorInfo)}.
		mImeDispatcher = imeDispatcher;
		if (mWindow != null) {
		mWindow.getOnBackInvokedDispatcher().setImeOnBackInvokedDispatcher(
		imeDispatcher);
		}
		}

		/**
		@@ -3860,6 +3864,11 @@ public class InputMethodService extends AbstractInputMethodService {
		};

		private void compatHandleBack() {
		if (!mDecorViewVisible) {
		Log.e(TAG, "Back callback invoked on a hidden IME. Removing the callback...");
		unregisterCompatOnBackInvokedCallback();
		return;
		}
		final KeyEvent downEvent = createBackKeyEvent(
		KeyEvent.ACTION_DOWN, false /* isTracking */);
		onKeyDown(KeyEvent.KEYCODE_BACK, downEvent);

core/java/android/provider/Settings.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -10870,6 +10870,15 @@ public final class Settings {
		public static final String LAUNCHER_TASKBAR_EDUCATION_SHOWING =
		"launcher_taskbar_education_showing";

		/**
		* Whether or not adaptive charging feature is enabled by user.
		* Type: int (0 for false, 1 for true)
		* Default: 1
		*
		* @hide
		*/
		public static final String ADAPTIVE_CHARGING_ENABLED = "adaptive_charging_enabled";

		/**
		* These entries are considered common between the personal and the managed profile,
		* since the managed profile doesn't get to change them.
		@@ -11433,7 +11442,7 @@ public final class Settings {
		* Whether or not data roaming is enabled. (0 = false, 1 = true)
		* Use {@link TelephonyManager#isDataRoamingEnabled} instead of calling via settings.
		*/
		@Readable(maxTargetSdk = Build.VERSION_CODES.S)
		@Readable(maxTargetSdk = Build.VERSION_CODES.S_V2)
		public static final String DATA_ROAMING = "data_roaming";

		/**

core/java/android/view/FrameMetrics.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -254,8 +254,9 @@ public final class FrameMetrics {
		int GPU_COMPLETED = 19;
		int SWAP_BUFFERS_COMPLETED = 20;
		int DISPLAY_PRESENT_TIME = 21;
		int COMMAND_SUBMISSION_COMPLETED = 22;

		int FRAME_STATS_COUNT = 22; // must always be last and in sync with
		int FRAME_STATS_COUNT = 23; // must always be last and in sync with
		// FrameInfoIndex::NumIndexes in libs/hwui/FrameInfo.h
		}

		@@ -291,7 +292,7 @@ public final class FrameMetrics {
		// RESERVED VSYNC_TIMESTAMP
		0, 0,
		// GPU_DURATION
		Index.SWAP_BUFFERS, Index.GPU_COMPLETED,
		Index.COMMAND_SUBMISSION_COMPLETED, Index.GPU_COMPLETED,
		// DEADLINE
		Index.INTENDED_VSYNC, Index.FRAME_DEADLINE,
		};

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -543,6 +543,11 @@ public final class SystemUiDeviceConfigFlags {
		*/
		public static final String TASK_MANAGER_ENABLED = "task_manager_enabled";

		/**
		* (boolean) Whether the task manager should show an attention grabbing dot when tasks changed.
		*/
		public static final String TASK_MANAGER_SHOW_FOOTER_DOT = "task_manager_show_footer_dot";


		/**
		* (boolean) Whether the clipboard overlay is enabled.

core/proto/android/os/processstarttime.proto

0 → 100644

+92 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		syntax = "proto2";
		package android.os;

		option java_multiple_files = true;

		// This message is used for statsd logging and should be kept in sync with
		// frameworks/proto_logging/stats/atoms.proto
		/**
		* Logs information about process start time.
		*
		* Logged from:
		* frameworks/base/services/core/java/com/android/server/am/ActivityManagerService.java
		*/
		message ProcessStartTime {
		// The uid of the ProcessRecord.
		optional int32 uid = 1;

		// The process pid.
		optional int32 pid = 2;

		// The process name.
		// Usually package name, "system" for system server.
		// Provided by ActivityManagerService.
		optional string process_name = 3;

		enum StartType {
		UNKNOWN = 0;
		WARM = 1;
		HOT = 2;
		COLD = 3;
		}

		// The start type.
		optional StartType type = 4;

		// The elapsed realtime at the start of the process.
		optional int64 process_start_time_millis = 5;

		// Number of milliseconds it takes to reach bind application.
		optional int32 bind_application_delay_millis = 6;

		// Number of milliseconds it takes to finish start of the process.
		optional int32 process_start_delay_millis = 7;

		// hostingType field in ProcessRecord, the component type such as "activity",
		// "service", "content provider", "broadcast" or other strings.
		optional string hosting_type = 8;

		// hostingNameStr field in ProcessRecord. The component class name that runs
		// in this process.
		optional string hosting_name = 9;

		// Broadcast action name.
		optional string broadcast_action_name = 10;

		enum HostingTypeId {
		HOSTING_TYPE_UNKNOWN = 0;
		HOSTING_TYPE_ACTIVITY = 1;
		HOSTING_TYPE_ADDED_APPLICATION = 2;
		HOSTING_TYPE_BACKUP = 3;
		HOSTING_TYPE_BROADCAST = 4;
		HOSTING_TYPE_CONTENT_PROVIDER = 5;
		HOSTING_TYPE_LINK_FAIL = 6;
		HOSTING_TYPE_ON_HOLD = 7;
		HOSTING_TYPE_NEXT_ACTIVITY = 8;
		HOSTING_TYPE_NEXT_TOP_ACTIVITY = 9;
		HOSTING_TYPE_RESTART = 10;
		HOSTING_TYPE_SERVICE = 11;
		HOSTING_TYPE_SYSTEM = 12;
		HOSTING_TYPE_TOP_ACTIVITY = 13;
		HOSTING_TYPE_EMPTY = 14;
		}

		optional HostingTypeId hosting_type_id = 11;
		}