Snap for 7497286 from f878ebce5a2992b0bcdda5b2400fd58a24aa7851 to sc-release (3dd391fc) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManagerInternal.java

+17 −1

Original line number	Diff line number	Diff line
		@@ -16,9 +16,9 @@

		package android.app;

		import android.app.AppOpsManager.AttributionFlags;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.AppOpsManager.AttributionFlags;
		import android.content.AttributionSource;
		import android.os.IBinder;
		import android.util.SparseArray;
		@@ -29,6 +29,7 @@ import com.android.internal.util.function.DecFunction;
		import com.android.internal.util.function.HeptFunction;
		import com.android.internal.util.function.HexFunction;
		import com.android.internal.util.function.QuadFunction;
		import com.android.internal.util.function.QuintConsumer;
		import com.android.internal.util.function.QuintFunction;
		import com.android.internal.util.function.TriFunction;
		import com.android.internal.util.function.UndecFunction;
		@@ -154,6 +155,21 @@ public abstract class AppOpsManagerInternal {
		Boolean, String, Boolean, Boolean, Integer, Integer, Integer,
		SyncNotedAppOp> superImpl);

		/**
		* Allows overriding finish op.
		*
		* @param clientId The client state.
		* @param code The op code to finish.
		* @param uid The UID for which the op was noted.
		* @param packageName The package for which it was noted. {@code null} for system package.
		* @param attributionTag the attribution tag.
		*/
		default void finishOperation(IBinder clientId, int code, int uid, String packageName,
		String attributionTag,
		@NonNull QuintConsumer<IBinder, Integer, Integer, String, String> superImpl) {
		superImpl.accept(clientId, code, uid, packageName, attributionTag);
		}

		/**
		* Allows overriding finish proxy op.
		*

core/java/android/text/Layout.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -2351,7 +2351,10 @@ public abstract class Layout {
		final int ellipsisStringLen = ellipsisString.length();
		// Use the ellipsis string only if there are that at least as many characters to replace.
		final boolean useEllipsisString = ellipsisCount >= ellipsisStringLen;
		for (int i = 0; i < ellipsisCount; i++) {
		final int min = Math.max(0, start - ellipsisStart - lineStart);
		final int max = Math.min(ellipsisCount, end - ellipsisStart - lineStart);

		for (int i = min; i < max; i++) {
		final char c;
		if (useEllipsisString && i < ellipsisStringLen) {
		c = ellipsisString.charAt(i);
		@@ -2360,11 +2363,9 @@ public abstract class Layout {
		}

		final int a = i + ellipsisStart + lineStart;
		if (start <= a && a < end) {
		dest[destoff + a - start] = c;
		}
		}
		}

		/**
		* Stores information about bidirectional (left-to-right or right-to-left)

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -612,8 +612,10 @@
		</string-array>
		<string name="fingerprint_icon_content_description" msgid="4741068463175388817">"Vingerafdrukikoon"</string>
		<string name="face_recalibrate_notification_name" msgid="7311163114750748686">"Gesigslot"</string>
		<string name="face_recalibrate_notification_title" msgid="5944930528030496897">"Skryf jou gesig weer in"</string>
		<string name="face_recalibrate_notification_content" msgid="892757485125249962">"Skryf asseblief jou gesig weer in om herkenning te verbeter"</string>
		<!-- no translation found for face_recalibrate_notification_title (2524791952735579082) -->
		<skip />
		<!-- no translation found for face_recalibrate_notification_content (3064513770251355594) -->
		<skip />
		<string name="face_setup_notification_title" msgid="8843461561970741790">"Stel Gesigslot op"</string>
		<string name="face_setup_notification_content" msgid="5463999831057751676">"Ontsluit jou foon deur daarna te kyk"</string>
		<string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"Stel meer maniere op om te ontsluit"</string>

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -585,8 +585,7 @@
		<string name="fingerprint_acquired_already_enrolled" msgid="2285166003936206785">"ሌላ የጣት አሻራ ይሞክሩ"</string>
		<string name="fingerprint_acquired_too_bright" msgid="3863560181670915607">"በጣም ብርሃናማ"</string>
		<string name="fingerprint_acquired_try_adjusting" msgid="3667006071003809364">"ለማስተካከል ይሞክሩ"</string>
		<!-- no translation found for fingerprint_acquired_immobile (1621891895241888048) -->
		<skip />
		<string name="fingerprint_acquired_immobile" msgid="1621891895241888048">"በእያንዳንዱ ጊዜ የጣትዎን ቦታ በትንሹ ይለዋውጡ"</string>
		<string-array name="fingerprint_acquired_vendor">
		</string-array>
		<string name="fingerprint_authenticated" msgid="2024862866860283100">"የጣት አሻራ ትክክለኛነት ተረጋግጧል"</string>
		@@ -613,8 +612,10 @@
		</string-array>
		<string name="fingerprint_icon_content_description" msgid="4741068463175388817">"የጣት አሻራ አዶ"</string>
		<string name="face_recalibrate_notification_name" msgid="7311163114750748686">"በመልክ መክፈት"</string>
		<string name="face_recalibrate_notification_title" msgid="5944930528030496897">"የእርስዎን ፊት ዳግመኛ ያስመዝግቡ"</string>
		<string name="face_recalibrate_notification_content" msgid="892757485125249962">"ማንነትን ለይቶ ማወቅን ለማሻሻል፣ እባክዎ የእርስዎን ፊት ዳግም ያስመዝግቡ"</string>
		<!-- no translation found for face_recalibrate_notification_title (2524791952735579082) -->
		<skip />
		<!-- no translation found for face_recalibrate_notification_content (3064513770251355594) -->
		<skip />
		<string name="face_setup_notification_title" msgid="8843461561970741790">"በመልክ መክፈትን ያዋቅሩ"</string>
		<string name="face_setup_notification_content" msgid="5463999831057751676">"ስልክዎን በመመልከት ያስከፍቱት"</string>
		<string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"የሚከፍቱባቸው ተጨማሪ መንገዶችን ያቀናብሩ"</string>

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -146,7 +146,7 @@
		<string name="wfcSpnFormat_wifi" msgid="1376356951297043426">"Wi-Fi"</string>
		<string name="wfcSpnFormat_wifi_calling_wo_hyphen" msgid="7178561009225028264">"‏الاتصال عبر WiFi"</string>
		<string name="wfcSpnFormat_vowifi" msgid="8371335230890725606">"VoWifi"</string>
		<string name="wifi_calling_off_summary" msgid="5626710010766902560">"إيقاف"</string>
		<string name="wifi_calling_off_summary" msgid="5626710010766902560">"غير مفعّل"</string>
		<string name="wfc_mode_wifi_preferred_summary" msgid="1035175836270943089">"‏الاتصال عبر Wi-Fi"</string>
		<string name="wfc_mode_cellular_preferred_summary" msgid="4958965609212575619">"الاتصال عبر شبكة الجوّال"</string>
		<string name="wfc_mode_wifi_only_summary" msgid="104951993894678665">"‏Wi-Fi فقط"</string>
		@@ -597,8 +597,7 @@
		<string name="fingerprint_acquired_already_enrolled" msgid="2285166003936206785">"يمكنك تجربة بصمة إصبع أخرى."</string>
		<string name="fingerprint_acquired_too_bright" msgid="3863560181670915607">"الصورة ساطعة للغاية."</string>
		<string name="fingerprint_acquired_try_adjusting" msgid="3667006071003809364">"حاوِل تعديل بصمة الإصبع."</string>
		<!-- no translation found for fingerprint_acquired_immobile (1621891895241888048) -->
		<skip />
		<string name="fingerprint_acquired_immobile" msgid="1621891895241888048">"غيِّر موضع إصبعك قليلاً في كل مرة."</string>
		<string-array name="fingerprint_acquired_vendor">
		</string-array>
		<string name="fingerprint_authenticated" msgid="2024862866860283100">"تم مصادقة بصمة الإصبع"</string>
		@@ -625,8 +624,10 @@
		</string-array>
		<string name="fingerprint_icon_content_description" msgid="4741068463175388817">"رمز بصمة الإصبع"</string>
		<string name="face_recalibrate_notification_name" msgid="7311163114750748686">"فتح الجهاز بالتعرف على الوجه"</string>
		<string name="face_recalibrate_notification_title" msgid="5944930528030496897">"إعادة تسجيل وجهك"</string>
		<string name="face_recalibrate_notification_content" msgid="892757485125249962">"لتحسين قدرة الجهاز على معرفة وجهك، يُرجى إعادة تسجيل الوجه."</string>
		<!-- no translation found for face_recalibrate_notification_title (2524791952735579082) -->
		<skip />
		<!-- no translation found for face_recalibrate_notification_content (3064513770251355594) -->
		<skip />
		<string name="face_setup_notification_title" msgid="8843461561970741790">"إعداد ميزة \"فتح الجهاز بالتعرف على الوجه\""</string>
		<string name="face_setup_notification_content" msgid="5463999831057751676">"يمكنك فتح قفل هاتفك بمجرّد النظر إلى الشاشة."</string>
		<string name="fingerprint_setup_notification_title" msgid="2002630611398849495">"إعداد المزيد من الطرق لفتح قفل الجهاز"</string>