Snap for 5713174 from 6f672a38356457bd23c89efaa8f1b89953843662 to qt-release (b2632ffd) · Commits · e / os / android_frameworks_base

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -2312,6 +2312,7 @@ package android.provider {
		}

		public static interface DeviceConfig.WindowManager {
		field public static final String KEY_SYSTEM_GESTURES_EXCLUDED_BY_PRE_Q_STICKY_IMMERSIVE = "system_gestures_excluded_by_pre_q_sticky_immersive";
		field public static final String KEY_SYSTEM_GESTURE_EXCLUSION_LIMIT_DP = "system_gesture_exclusion_limit_dp";
		}

core/java/android/app/AppOpsManager.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -2507,7 +2507,7 @@ public class AppOpsManager {
		}

		/**
		* @return The duration of the operation in milliseconds.
		* @return The duration of the operation in milliseconds. The duration is in wall time.
		*/
		public long getDuration() {
		return getLastDuration(MAX_PRIORITY_UID_STATE, MIN_PRIORITY_UID_STATE, OP_FLAGS_ALL);
		@@ -2515,7 +2515,7 @@ public class AppOpsManager {

		/**
		* Return the duration in milliseconds the app accessed this op while
		* in the foreground.
		* in the foreground. The duration is in wall time.
		*
		* @param flags The flags which are any combination of
		* {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
		@@ -2534,7 +2534,7 @@ public class AppOpsManager {

		/**
		* Return the duration in milliseconds the app accessed this op while
		* in the background.
		* in the background. The duration is in wall time.
		*
		* @param flags The flags which are any combination of
		* {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
		@@ -2553,7 +2553,7 @@ public class AppOpsManager {

		/**
		* Return the duration in milliseconds the app accessed this op for
		* a given range of UID states.
		* a given range of UID states. The duration is in wall time.
		*
		* @param fromUidState The UID state for which to query. Could be one of
		* {@link #UID_STATE_PERSISTENT}, {@link #UID_STATE_TOP},
		@@ -3968,6 +3968,7 @@ public class AppOpsManager {

		/**
		* Gets the total duration the app op was accessed (performed) in the foreground.
		* The duration is in wall time.
		*
		* @param flags The flags which are any combination of
		* {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
		@@ -3986,6 +3987,7 @@ public class AppOpsManager {

		/**
		* Gets the total duration the app op was accessed (performed) in the background.
		* The duration is in wall time.
		*
		* @param flags The flags which are any combination of
		* {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
		@@ -4004,7 +4006,7 @@ public class AppOpsManager {

		/**
		* Gets the total duration the app op was accessed (performed) for a given
		* range of UID states.
		* range of UID states. The duration is in wall time.
		*
		* @param fromUidState The UID state from which to query. Could be one of
		* {@link #UID_STATE_PERSISTENT}, {@link #UID_STATE_TOP},

core/java/android/provider/DeviceConfig.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -325,6 +325,17 @@ public final class DeviceConfig {
		*/
		@TestApi
		String KEY_SYSTEM_GESTURE_EXCLUSION_LIMIT_DP = "system_gesture_exclusion_limit_dp";

		/**
		* Key for controlling whether system gestures are implicitly excluded by windows requesting
		* sticky immersive mode from apps that are targeting an SDK prior to Q.
		*
		* @see android.provider.DeviceConfig#NAMESPACE_WINDOW_MANAGER
		* @hide
		*/
		@TestApi
		String KEY_SYSTEM_GESTURES_EXCLUDED_BY_PRE_Q_STICKY_IMMERSIVE =
		"system_gestures_excluded_by_pre_q_sticky_immersive";
		}

		private static final Object sLock = new Object();

packages/SettingsLib/res/values-en-rAU/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -408,7 +408,7 @@
		<string name="battery_info_status_charging" msgid="1705179948350365604">"Charging"</string>
		<string name="battery_info_status_charging_lower" msgid="8689770213898117994">"charging"</string>
		<string name="battery_info_status_discharging" msgid="310932812698268588">"Not charging"</string>
		<string name="battery_info_status_not_charging" msgid="8523453668342598579">"Plugged in, can\'t charge right now"</string>
		<string name="battery_info_status_not_charging" msgid="8523453668342598579">"Plugged in, can\'t charge at the moment"</string>
		<string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string>
		<string name="disabled_by_admin_summary_text" msgid="6750513964908334617">"Controlled by admin"</string>
		<string name="disabled" msgid="9206776641295849915">"Disabled"</string>

packages/SettingsLib/res/values-en-rCA/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -408,7 +408,7 @@
		<string name="battery_info_status_charging" msgid="1705179948350365604">"Charging"</string>
		<string name="battery_info_status_charging_lower" msgid="8689770213898117994">"charging"</string>
		<string name="battery_info_status_discharging" msgid="310932812698268588">"Not charging"</string>
		<string name="battery_info_status_not_charging" msgid="8523453668342598579">"Plugged in, can\'t charge right now"</string>
		<string name="battery_info_status_not_charging" msgid="8523453668342598579">"Plugged in, can\'t charge at the moment"</string>
		<string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string>
		<string name="disabled_by_admin_summary_text" msgid="6750513964908334617">"Controlled by admin"</string>
		<string name="disabled" msgid="9206776641295849915">"Disabled"</string>