Snap for 10367700 from b2c9ba11d3c7cbcff95cd9408f614ce3e9a4ff07 to udc-release (518ea8eb) · Commits · e / os / android_frameworks_base

core/java/android/companion/CompanionDeviceManager.java

+0 −14

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ import android.app.NotificationManager;
		import android.app.PendingIntent;
		import android.bluetooth.BluetoothAdapter;
		import android.bluetooth.BluetoothDevice;
		import android.companion.utils.FeatureUtils;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		@@ -1227,11 +1226,6 @@ public final class CompanionDeviceManager {
		@Nullable
		public IntentSender buildPermissionTransferUserConsentIntent(int associationId)
		throws DeviceNotAssociatedException {
		if (!FeatureUtils.isPermSyncEnabled()) {
		throw new UnsupportedOperationException("Calling"
		+ " buildPermissionTransferUserConsentIntent, but this API is disabled by the"
		+ " system.");
		}
		try {
		PendingIntent pendingIntent = mService.buildPermissionTransferUserConsentIntent(
		mContext.getOpPackageName(),
		@@ -1264,10 +1258,6 @@ public final class CompanionDeviceManager {
		@Deprecated
		@UserHandleAware
		public void startSystemDataTransfer(int associationId) throws DeviceNotAssociatedException {
		if (!FeatureUtils.isPermSyncEnabled()) {
		throw new UnsupportedOperationException("Calling startSystemDataTransfer, but this API"
		+ " is disabled by the system.");
		}
		try {
		mService.startSystemDataTransfer(mContext.getOpPackageName(), mContext.getUserId(),
		associationId, null);
		@@ -1300,10 +1290,6 @@ public final class CompanionDeviceManager {
		@NonNull Executor executor,
		@NonNull OutcomeReceiver<Void, CompanionException> result)
		throws DeviceNotAssociatedException {
		if (!FeatureUtils.isPermSyncEnabled()) {
		throw new UnsupportedOperationException("Calling startSystemDataTransfer, but this API"
		+ " is disabled by the system.");
		}
		try {
		mService.startSystemDataTransfer(mContext.getOpPackageName(), mContext.getUserId(),
		associationId, new SystemDataTransferCallbackProxy(executor, result));

core/java/android/companion/utils/FeatureUtils.java

+14 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.companion.utils;

		import android.os.Binder;
		import android.os.Build;
		import android.provider.DeviceConfig;

		@@ -31,8 +32,19 @@ public final class FeatureUtils {
		private static final String PROPERTY_PERM_SYNC_ENABLED = "perm_sync_enabled";

		public static boolean isPermSyncEnabled() {
		return Build.isDebuggable() \|\| DeviceConfig.getBoolean(NAMESPACE_COMPANION,
		// Permissions sync is always enabled in debuggable mode.
		if (Build.isDebuggable()) {
		return true;
		}

		// Clear app identity to read the device config for feature flag.
		final long identity = Binder.clearCallingIdentity();
		try {
		return DeviceConfig.getBoolean(NAMESPACE_COMPANION,
		PROPERTY_PERM_SYNC_ENABLED, false);
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		}

		private FeatureUtils() {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1256,7 +1256,7 @@
		<string name="android_upgrading_starting_apps" msgid="6206161195076057075">"Приложенията се стартират."</string>
		<string name="android_upgrading_complete" msgid="409800058018374746">"Зареждането завършва."</string>
		<string name="fp_power_button_enrollment_message" msgid="5648173517663246140">"Натиснахте бутона за включване/изключване – това обикновено изключва екрана.\n\nОпитайте да докоснете леко, докато настройвате отпечатъка си."</string>
		<string name="fp_power_button_enrollment_title" msgid="6976841690455338563">"Изключете екрана за изход от настройката"</string>
		<string name="fp_power_button_enrollment_title" msgid="6976841690455338563">"За изход изключете екрана"</string>
		<string name="fp_power_button_enrollment_button_text" msgid="3199783266386029200">"Изключване"</string>
		<string name="fp_power_button_bp_title" msgid="5585506104526820067">"Напред с потвърждаването на отпечатъка?"</string>
		<string name="fp_power_button_bp_message" msgid="2983163038168903393">"Натиснахте бутона за включване/изключване – това обикновено изключва екрана.\n\nОпитайте да докоснете леко, за да потвърдите отпечатъка си."</string>

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1258,7 +1258,7 @@
		<string name="android_upgrading_complete" msgid="409800058018374746">"תהליך האתחול בשלבי סיום."</string>
		<string name="fp_power_button_enrollment_message" msgid="5648173517663246140">"לחצת על לחצן ההפעלה – בדרך כלל הפעולה הזו מכבה את המסך.\n\nעליך לנסות להקיש בעדינות במהלך ההגדרה של טביעת האצבע שלך."</string>
		<string name="fp_power_button_enrollment_title" msgid="6976841690455338563">"לסיום ההגדרה, יש לכבות את המסך"</string>
		<string name="fp_power_button_enrollment_button_text" msgid="3199783266386029200">"השבתה"</string>
		<string name="fp_power_button_enrollment_button_text" msgid="3199783266386029200">"כיבוי"</string>
		<string name="fp_power_button_bp_title" msgid="5585506104526820067">"להמשיך לאמת את טביעת האצבע שלך?"</string>
		<string name="fp_power_button_bp_message" msgid="2983163038168903393">"לחצת על לחצן ההפעלה – בדרך כלל הפעולה הזו מכבה את המסך.\n\nעליך לנסות להקיש בעדינות כדי לאמת את טביעת האצבע שלך."</string>
		<string name="fp_power_button_bp_positive_button" msgid="728945472408552251">"כיבוי המסך"</string>

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -701,7 +701,7 @@
		<!-- no translation found for face_acquired_mouth_covering_detected (8219428572168642593) -->
		<skip />
		<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"Kan gezichtsmodel niet maken. Probeer het opnieuw."</string>
		<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"Donkere bril waargenomen. Je gezicht moet geheel zichtbaar zijn."</string>
		<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"Donkere bril waargenomen. Je gezicht moet helemaal zichtbaar zijn."</string>
		<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"Gezichtsbedekking waargenomen. Je hele gezicht moet zichtbaar zijn."</string>
		<string-array name="face_acquired_vendor">
		</string-array>
		@@ -1256,7 +1256,7 @@
		<string name="android_upgrading_starting_apps" msgid="6206161195076057075">"Apps starten."</string>
		<string name="android_upgrading_complete" msgid="409800058018374746">"Opstarten afronden."</string>
		<string name="fp_power_button_enrollment_message" msgid="5648173517663246140">"Je hebt op de aan/uit-knop gedrukt. Zo zet je meestal het scherm uit.\n\nRaak de knop voorzichtig aan terwijl je je vingerafdruk instelt."</string>
		<string name="fp_power_button_enrollment_title" msgid="6976841690455338563">"Zet het scherm uit om het instellen te beëindigen"</string>
		<string name="fp_power_button_enrollment_title" msgid="6976841690455338563">"Zet scherm uit om instellen te beëindigen"</string>
		<string name="fp_power_button_enrollment_button_text" msgid="3199783266386029200">"Uitzetten"</string>
		<string name="fp_power_button_bp_title" msgid="5585506104526820067">"Doorgaan met verificatie van je vingerafdruk?"</string>
		<string name="fp_power_button_bp_message" msgid="2983163038168903393">"Je hebt op de aan/uit-knop gedrukt. Zo zet je meestal het scherm uit.\n\nRaak de knop voorzichtig aan om je vingerafdruk te verifiëren."</string>