Snap for 5716220 from be0c17849aa22d80adadf22f257d93d2bc587b40 to qt-c2f2-release (15d29607) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManager.java

+20 −11

Original line number	Diff line number	Diff line
		@@ -240,7 +240,8 @@ public class AppOpsManager {
		public @interface UidState {}

		/**
		* Uid state: The UID is a foreground persistent app.
		* Uid state: The UID is a foreground persistent app. The lower the UID
		* state the more important the UID is for the user.
		* @hide
		*/
		@TestApi
		@@ -248,7 +249,8 @@ public class AppOpsManager {
		public static final int UID_STATE_PERSISTENT = 100;

		/**
		* Uid state: The UID is top foreground app.
		* Uid state: The UID is top foreground app. The lower the UID
		* state the more important the UID is for the user.
		* @hide
		*/
		@TestApi
		@@ -257,6 +259,7 @@ public class AppOpsManager {

		/**
		* Uid state: The UID is running a foreground service of location type.
		* The lower the UID state the more important the UID is for the user.
		* @hide
		*/
		@TestApi
		@@ -264,7 +267,8 @@ public class AppOpsManager {
		public static final int UID_STATE_FOREGROUND_SERVICE_LOCATION = 300;

		/**
		* Uid state: The UID is running a foreground service.
		* Uid state: The UID is running a foreground service. The lower the UID
		* state the more important the UID is for the user.
		* @hide
		*/
		@TestApi
		@@ -279,7 +283,8 @@ public class AppOpsManager {
		public static final int UID_STATE_MAX_LAST_NON_RESTRICTED = UID_STATE_FOREGROUND_SERVICE;

		/**
		* Uid state: The UID is a foreground app.
		* Uid state: The UID is a foreground app. The lower the UID
		* state the more important the UID is for the user.
		* @hide
		*/
		@TestApi
		@@ -287,7 +292,8 @@ public class AppOpsManager {
		public static final int UID_STATE_FOREGROUND = 500;

		/**
		* Uid state: The UID is a background app.
		* Uid state: The UID is a background app. The lower the UID
		* state the more important the UID is for the user.
		* @hide
		*/
		@TestApi
		@@ -295,7 +301,8 @@ public class AppOpsManager {
		public static final int UID_STATE_BACKGROUND = 600;

		/**
		* Uid state: The UID is a cached app.
		* Uid state: The UID is a cached app. The lower the UID
		* state the more important the UID is for the user.
		* @hide
		*/
		@TestApi
		@@ -2507,7 +2514,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 +2522,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 +2541,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 +2560,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 +3975,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 +3994,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 +4013,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/res/AndroidManifest.xml

+71 −25

Original line number	Diff line number	Diff line
		@@ -724,6 +724,10 @@

		<!-- Allows an application to send SMS messages.
		<p>Protection level: dangerous

		<p> This is a hard restricted permission which cannot be held by an app until
		the installer on record did not whitelist the permission. For more details see
		{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
		-->
		<permission android:name="android.permission.SEND_SMS"
		android:permissionGroup="android.permission-group.UNDEFINED"
		@@ -734,6 +738,10 @@

		<!-- Allows an application to receive SMS messages.
		<p>Protection level: dangerous

		<p> This is a hard restricted permission which cannot be held by an app until
		the installer on record did not whitelist the permission. For more details see
		{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
		-->
		<permission android:name="android.permission.RECEIVE_SMS"
		android:permissionGroup="android.permission-group.UNDEFINED"
		@@ -744,6 +752,10 @@

		<!-- Allows an application to read SMS messages.
		<p>Protection level: dangerous

		<p> This is a hard restricted permission which cannot be held by an app until
		the installer on record did not whitelist the permission. For more details see
		{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
		-->
		<permission android:name="android.permission.READ_SMS"
		android:permissionGroup="android.permission-group.UNDEFINED"
		@@ -754,6 +766,10 @@

		<!-- Allows an application to receive WAP push messages.
		<p>Protection level: dangerous

		<p> This is a hard restricted permission which cannot be held by an app until
		the installer on record did not whitelist the permission. For more details see
		{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
		-->
		<permission android:name="android.permission.RECEIVE_WAP_PUSH"
		android:permissionGroup="android.permission-group.UNDEFINED"
		@@ -764,6 +780,10 @@

		<!-- Allows an application to monitor incoming MMS messages.
		<p>Protection level: dangerous

		<p> This is a hard restricted permission which cannot be held by an app until
		the installer on record did not whitelist the permission. For more details see
		{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
		-->
		<permission android:name="android.permission.RECEIVE_MMS"
		android:permissionGroup="android.permission-group.UNDEFINED"
		@@ -783,6 +803,11 @@
		when the alert is first received, and to delay presenting the info
		to the user until after the initial alert dialog is dismissed.
		<p>Protection level: dangerous

		<p> This is a hard restricted permission which cannot be held by an app until
		the installer on record did not whitelist the permission. For more details see
		{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.

		@hide Pending API council approval -->
		<permission android:name="android.permission.READ_CELL_BROADCASTS"
		android:permissionGroup="android.permission-group.UNDEFINED"
		@@ -824,11 +849,16 @@
		grants your app this permission. If you don't need this permission, be sure your <a
		href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code
		targetSdkVersion}</a> is 4 or higher.
		<p>Is this permission is not whitelisted for an app that targets an API level before
		{@link android.os.Build.VERSION_CODES#Q} this permission cannot be granted to apps.</p>
		<p>Is this permission is not whitelisted for an app that targets an API level
		{@link android.os.Build.VERSION_CODES#Q} or later the app will be forced into isolated storage.
		</p>

		<p> This is a soft restricted permission which cannot be held by an app it its
		full form until the installer on record did not whitelist the permission.
		Specifically, if the permission is whitelisted the holder app can access
		external storage and the visual and aural media collections while if the
		permission is not whitelisted the holder app can only access to the visual
		and aural medial collections. Also the permission is immutably restricted
		meaning that the whitelist state can be specified only at install time and
		cannot change until the app is installed. For more details see
		{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
		-->
		<permission android:name="android.permission.READ_EXTERNAL_STORAGE"
		android:permissionGroup="android.permission-group.UNDEFINED"
		@@ -916,6 +946,10 @@
		{@link #ACCESS_FINE_LOCATION}. Requesting this permission by itself doesn't give you
		location access.
		<p>Protection level: dangerous

		<p> This is a hard restricted permission which cannot be held by an app until
		the installer on record did not whitelist the permission. For more details see
		{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
		-->
		<permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"
		android:permissionGroup="android.permission-group.UNDEFINED"
		@@ -958,6 +992,10 @@
		href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code
		targetSdkVersion}</a> is 16 or higher.</p>
		<p>Protection level: dangerous

		<p> This is a hard restricted permission which cannot be held by an app until
		the installer on record did not whitelist the permission. For more details see
		{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
		-->
		<permission android:name="android.permission.READ_CALL_LOG"
		android:permissionGroup="android.permission-group.UNDEFINED"
		@@ -978,6 +1016,10 @@
		href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code
		targetSdkVersion}</a> is 16 or higher.</p>
		<p>Protection level: dangerous

		<p> This is a hard restricted permission which cannot be held by an app until
		the installer on record did not whitelist the permission. For more details see
		{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
		-->
		<permission android:name="android.permission.WRITE_CALL_LOG"
		android:permissionGroup="android.permission-group.UNDEFINED"
		@@ -991,6 +1033,10 @@
		abort the call altogether.
		<p>Protection level: dangerous

		<p> This is a hard restricted permission which cannot be held by an app until
		the installer on record did not whitelist the permission. For more details see
		{@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.

		@deprecated Applications should use {@link android.telecom.CallRedirectionService} instead
		of the {@link android.content.Intent#ACTION_NEW_OUTGOING_CALL} broadcast.
		-->

core/res/res/values-af/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -567,7 +567,7 @@
		<string name="face_acquired_too_right" msgid="3667075962661863218">"Beweeg foon na links."</string>
		<string name="face_acquired_too_left" msgid="3148242963894703424">"Beweeg foon na regs."</string>
		<string name="face_acquired_poor_gaze" msgid="5606479370806754905">"Kyk asseblief meer reguit na jou toestel."</string>
		<string name="face_acquired_not_detected" msgid="4885504661626728809">"Kan nie jou gesig sien nie. Kyk na die foon."</string>
		<string name="face_acquired_not_detected" msgid="1879714205006680222">"Posisioneer jou gesig direk voor die foon."</string>
		<string name="face_acquired_too_much_motion" msgid="3149332171102108851">"Te veel beweging. Hou foon stil."</string>
		<string name="face_acquired_recalibrate" msgid="8077949502893707539">"Skryf jou gesig asseblief weer in."</string>
		<string name="face_acquired_too_different" msgid="7663983770123789694">"Kan nie meer gesig herken nie. Probeer weer."</string>

core/res/res/values-am/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -567,7 +567,7 @@
		<string name="face_acquired_too_right" msgid="3667075962661863218">"ስልክን ወደ ግራ ያንቀሳቅሱ።"</string>
		<string name="face_acquired_too_left" msgid="3148242963894703424">"ስልክን ወደ ቀኝ ያንቀሳቅሱ።"</string>
		<string name="face_acquired_poor_gaze" msgid="5606479370806754905">"እባክዎ መሣሪያዎን ይበልጥ በቀጥታ ይመልከቱ።"</string>
		<string name="face_acquired_not_detected" msgid="4885504661626728809">"የእርስዎን ፊት መመልከት አይችልም። ስልኩ ላይ ይመልከቱ።"</string>
		<string name="face_acquired_not_detected" msgid="1879714205006680222">"መልክዎን በቀጥታ ከስልኩ ፊት ያድርጉት።"</string>
		<string name="face_acquired_too_much_motion" msgid="3149332171102108851">"ከልክ በላይ ብዙ እንቅስቃሴ። ስልኩን ቀጥ አድርገው ይያዙት።"</string>
		<string name="face_acquired_recalibrate" msgid="8077949502893707539">"እባክዎ ፊትዎን እንደገና ያስመዝግቡ"</string>
		<string name="face_acquired_too_different" msgid="7663983770123789694">"ከእንግዲህ ፊትን ለይቶ ማወቅ አይችልም። እንደገና ይሞክሩ።"</string>

core/res/res/values-ar/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -579,7 +579,7 @@
		<string name="face_acquired_too_right" msgid="3667075962661863218">"يُرجى نقل الهاتف إلى اليمين."</string>
		<string name="face_acquired_too_left" msgid="3148242963894703424">"يُرجى نقل الهاتف إلى اليسار."</string>
		<string name="face_acquired_poor_gaze" msgid="5606479370806754905">"يُرجى النظر إلى جهازك مباشرة أكثر."</string>
		<string name="face_acquired_not_detected" msgid="4885504661626728809">"يتعذّر رؤية وجهك. يُرجى النظر إلى الهاتف."</string>
		<string name="face_acquired_not_detected" msgid="1879714205006680222">"ضع وجهك أمام الهاتف مباشرة."</string>
		<string name="face_acquired_too_much_motion" msgid="3149332171102108851">"حركة أكثر من اللازم يُرجى حمل بدون حركة."</string>
		<string name="face_acquired_recalibrate" msgid="8077949502893707539">"يُرجى إعادة تسجيل وجهك."</string>
		<string name="face_acquired_too_different" msgid="7663983770123789694">"لم يعُد يمكن التعرّف على الوجه. حاول مرة أخرى."</string>