Merge TQ1A.221205.012 (1a4195e7) · Commits · e / os / android_frameworks_base

core/java/android/app/BroadcastOptions.java

+22 −0

Original line number	Diff line number	Diff line
		@@ -528,6 +528,28 @@ public class BroadcastOptions extends ComponentOptions {
		return mIsAlarmBroadcast;
		}

		/**
		* Did this broadcast originate from a push message from the server?
		*
		* @return true if this broadcast is a push message, false otherwise.
		* @hide
		*/
		public boolean isPushMessagingBroadcast() {
		return mTemporaryAppAllowlistReasonCode == PowerExemptionManager.REASON_PUSH_MESSAGING;
		}

		/**
		* Did this broadcast originate from a push message from the server which was over the allowed
		* quota?
		*
		* @return true if this broadcast is a push message over quota, false otherwise.
		* @hide
		*/
		public boolean isPushMessagingOverQuotaBroadcast() {
		return mTemporaryAppAllowlistReasonCode
		== PowerExemptionManager.REASON_PUSH_MESSAGING_OVER_QUOTA;
		}

		/** {@hide} */
		public long getRequireCompatChangeId() {
		return mRequireCompatChangeId;

core/java/android/os/Parcel.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -4435,6 +4435,9 @@ public final class Parcel {
		int type = readInt();
		if (isLengthPrefixed(type)) {
		int objectLength = readInt();
		if (objectLength < 0) {
		return null;
		}
		int end = MathUtils.addOrThrow(dataPosition(), objectLength);
		int valueLength = end - start;
		setDataPosition(end);

core/java/com/android/internal/widget/LockPatternUtils.java

+1 −8

Original line number	Diff line number	Diff line
		@@ -1522,8 +1522,7 @@ public class LockPatternUtils {
		STRONG_AUTH_REQUIRED_AFTER_LOCKOUT,
		STRONG_AUTH_REQUIRED_AFTER_TIMEOUT,
		STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN,
		STRONG_AUTH_REQUIRED_AFTER_NON_STRONG_BIOMETRICS_TIMEOUT,
		SOME_AUTH_REQUIRED_AFTER_TRUSTAGENT_EXPIRED})
		STRONG_AUTH_REQUIRED_AFTER_NON_STRONG_BIOMETRICS_TIMEOUT})
		@Retention(RetentionPolicy.SOURCE)
		public @interface StrongAuthFlags {}

		@@ -1575,12 +1574,6 @@ public class LockPatternUtils {
		*/
		public static final int STRONG_AUTH_REQUIRED_AFTER_NON_STRONG_BIOMETRICS_TIMEOUT = 0x80;

		/**
		* Some authentication is required because the trustagent either timed out or was disabled
		* manually.
		*/
		public static final int SOME_AUTH_REQUIRED_AFTER_TRUSTAGENT_EXPIRED = 0x100;

		/**
		* Strong auth flags that do not prevent biometric methods from being accepted as auth.
		* If any other flags are set, biometric authentication is disabled.

core/proto/android/os/processstarttime.proto

deleted100644 → 0

+0 −92

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

packages/SystemUI/res/values-land/dimens.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -59,4 +59,5 @@
		<dimen name="large_dialog_width">348dp</dimen>

		<dimen name="qs_panel_padding_top">@dimen/qqs_layout_margin_top</dimen>
		<dimen name="qs_panel_padding_top_combined_headers">@dimen/qs_panel_padding_top</dimen>
		</resources>