Snap for 7600758 from 284388a2678067d73e9f75c2332144e79dfa47e1 to sc-release (420215cf) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaRouter2Manager.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -292,8 +292,7 @@ public final class MediaRouter2Manager {
		}
		synchronized (mRoutesLock) {
		for (MediaRoute2Info route : mRoutes.values()) {
		if (sessionInfo.getSelectedRoutes().contains(route.getId())
		\|\| sessionInfo.getTransferableRoutes().contains(route.getId())) {
		if (sessionInfo.getTransferableRoutes().contains(route.getId())) {
		routes.add(route);
		continue;
		}

packages/SettingsLib/res/values-it/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -444,7 +444,7 @@
		<string name="power_remaining_less_than_duration_only" msgid="8956656616031395152">"Carica residua: meno di <xliff:g id="THRESHOLD">%1$s</xliff:g>"</string>
		<string name="power_remaining_less_than_duration" msgid="318215464914990578">"Carica residua: meno di <xliff:g id="THRESHOLD">%1$s</xliff:g> (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>
		<string name="power_remaining_more_than_subtext" msgid="446388082266121894">"Tempo residuo: più di <xliff:g id="TIME_REMAINING">%1$s</xliff:g> (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>
		<string name="power_remaining_only_more_than_subtext" msgid="4873750633368888062">"Tempo residuo: più di <xliff:g id="TIME_REMAINING">%1$s</xliff:g>"</string>
		<string name="power_remaining_only_more_than_subtext" msgid="4873750633368888062">"Tempo rimanente: più di <xliff:g id="TIME_REMAINING">%1$s</xliff:g>"</string>
		<string name="power_remaining_duration_only_shutdown_imminent" product="default" msgid="137330009791560774">"Il telefono potrebbe spegnersi a breve"</string>
		<string name="power_remaining_duration_only_shutdown_imminent" product="tablet" msgid="145489081521468132">"Il tablet potrebbe spegnersi a breve"</string>
		<string name="power_remaining_duration_only_shutdown_imminent" product="device" msgid="1070562682853942350">"Il dispositivo potrebbe spegnersi a breve"</string>

packages/SettingsLib/res/values-ky/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -309,7 +309,7 @@
		<string name="dev_settings_warning_message" msgid="37741686486073668">"Бул орнотуулар өндүрүүчүлөр үчүн гана берилген. Булар түзмөгүңүздүн колдонмолорун бузулушуна же туура эмес иштешине алып келиши мүмкүн."</string>
		<string name="verify_apps_over_usb_title" msgid="6031809675604442636">"Орнотулуучу колдонмону текшерүү"</string>
		<string name="verify_apps_over_usb_summary" msgid="1317933737581167839">"ADB/ADT аркылуу орнотулган колдонмолордун коопсуздугу текшерилет."</string>
		<string name="bluetooth_show_devices_without_names_summary" msgid="780964354377854507">"Аталышсыз Bluetooth түзмөктөрү (MAC даректери менен гана) көрсөтүлөт"</string>
		<string name="bluetooth_show_devices_without_names_summary" msgid="780964354377854507">"Аталышсыз Bluetooth түзмөктөрү (MAC даректери менен гана) көрүнөт"</string>
		<string name="bluetooth_disable_absolute_volume_summary" msgid="2006309932135547681">"Алыскы түзмөктөр өтө катуу добуш чыгарып же көзөмөлдөнбөй жатса Bluetooth \"Үндүн абсолюттук деңгээли\" функциясын өчүрөт."</string>
		<string name="bluetooth_enable_gabeldorsche_summary" msgid="2054730331770712629">"Bluetooth Gabeldorsche функциясынын топтомун иштетет."</string>
		<string name="enhanced_connectivity_summary" msgid="1576414159820676330">"Жакшыртылган туташуу функциясын иштетет."</string>

packages/SettingsLib/res/values-pl/strings.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -443,8 +443,8 @@
		<string name="power_suggestion_battery_run_out" msgid="6332089307827787087">"Bateria może się wyczerpać do <xliff:g id="TIME">%1$s</xliff:g>"</string>
		<string name="power_remaining_less_than_duration_only" msgid="8956656616031395152">"Pozostało mniej niż <xliff:g id="THRESHOLD">%1$s</xliff:g>"</string>
		<string name="power_remaining_less_than_duration" msgid="318215464914990578">"Pozostało mniej niż <xliff:g id="THRESHOLD">%1$s</xliff:g> (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>
		<string name="power_remaining_more_than_subtext" msgid="446388082266121894">"Pozostało mniej niż <xliff:g id="TIME_REMAINING">%1$s</xliff:g> (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>
		<string name="power_remaining_only_more_than_subtext" msgid="4873750633368888062">"Pozostało mniej niż <xliff:g id="TIME_REMAINING">%1$s</xliff:g>"</string>
		<string name="power_remaining_more_than_subtext" msgid="446388082266121894">"Pozostało ponad <xliff:g id="TIME_REMAINING">%1$s</xliff:g> (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>
		<string name="power_remaining_only_more_than_subtext" msgid="4873750633368888062">"Pozostało ponad <xliff:g id="TIME_REMAINING">%1$s</xliff:g>"</string>
		<string name="power_remaining_duration_only_shutdown_imminent" product="default" msgid="137330009791560774">"Wkrótce telefon może się wyłączyć"</string>
		<string name="power_remaining_duration_only_shutdown_imminent" product="tablet" msgid="145489081521468132">"Tablet może się wkrótce wyłączyć"</string>
		<string name="power_remaining_duration_only_shutdown_imminent" product="device" msgid="1070562682853942350">"Urządzenie może się wkrótce wyłączyć"</string>

services/core/java/com/android/server/BluetoothManagerService.java

+24 −2

Original line number	Diff line number	Diff line
		@@ -2505,6 +2505,16 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		mContext.sendBroadcastAsUser(intent, UserHandle.ALL, null, getTempAllowlistBroadcastOptions());
		}

		private boolean isBleState(int state) {
		switch (state) {
		case BluetoothAdapter.STATE_BLE_ON:
		case BluetoothAdapter.STATE_BLE_TURNING_ON:
		case BluetoothAdapter.STATE_BLE_TURNING_OFF:
		return true;
		}
		return false;
		}

		@RequiresPermission(allOf = {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.BLUETOOTH_PRIVILEGED,
		@@ -2527,8 +2537,15 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		sendBluetoothServiceDownCallback();
		unbindAndFinish();
		sendBleStateChanged(prevState, newState);
		// Don't broadcast as it has already been broadcast before
		isStandardBroadcast = false;

		/* Currently, the OFF intent is broadcasted externally only when we transition
		* from TURNING_OFF to BLE_ON state. So if the previous state is a BLE state,
		* we are guaranteed that the OFF intent has been broadcasted earlier and we
		* can safely skip it.
		* Conversely, if the previous state is not a BLE state, it indicates that some
		* sort of crash has occurred, moving us directly to STATE_OFF without ever
		* passing through BLE_ON. We should broadcast the OFF intent in this case. */
		isStandardBroadcast = !isBleState(prevState);

		} else if (!intermediate_off) {
		// connect to GattService
		@@ -2581,6 +2598,11 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		// Show prevState of BLE_ON as OFF to standard users
		prevState = BluetoothAdapter.STATE_OFF;
		}
		if (DBG) {
		Slog.d(TAG,
		"Sending State Change: " + BluetoothAdapter.nameForState(prevState) + " > "
		+ BluetoothAdapter.nameForState(newState));
		}
		Intent intent = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
		intent.putExtra(BluetoothAdapter.EXTRA_PREVIOUS_STATE, prevState);
		intent.putExtra(BluetoothAdapter.EXTRA_STATE, newState);