Snap for 9727520 from 07b420686a39981c59d9f21cc6da108919132efc to tm-qpr3-release (2956bf9f) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/CameraManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1189,8 +1189,8 @@ public final class CameraManager {
		PackageManager packageManager = context.getPackageManager();

		try {
		return packageManager.getProperty(context.getOpPackageName(),
		PROPERTY_COMPAT_OVERRIDE_LANDSCAPE_TO_PORTRAIT).getBoolean();
		return packageManager.getProperty(PROPERTY_COMPAT_OVERRIDE_LANDSCAPE_TO_PORTRAIT,
		context.getOpPackageName()).getBoolean();
		} catch (PackageManager.NameNotFoundException e) {
		// No such property
		}

core/java/android/provider/Settings.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -8000,6 +8000,15 @@ public final class Settings {
		public static final String ACCESSIBILITY_DISPLAY_INVERSION_ENABLED =
		"accessibility_display_inversion_enabled";

		/**
		* Flag that specifies whether font size has been changed. The flag will
		* be set when users change the scaled value of font size for the first time.
		* @hide
		*/
		@Readable
		public static final String ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED =
		"accessibility_font_scaling_has_been_changed";

		/**
		* Setting that specifies whether display color space adjustment is
		* enabled.

core/java/android/service/dreams/DreamActivity.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -58,11 +58,13 @@ public class DreamActivity extends Activity {
		setTitle(title);
		}

		final Bundle extras = getIntent().getExtras();
		mCallback = (DreamService.DreamActivityCallbacks) extras.getBinder(EXTRA_CALLBACK);

		if (mCallback != null) {
		final Object callback = getIntent().getExtras().getBinder(EXTRA_CALLBACK);
		if (callback instanceof DreamService.DreamActivityCallbacks) {
		mCallback = (DreamService.DreamActivityCallbacks) callback;
		mCallback.onActivityCreated(this);
		} else {
		mCallback = null;
		finishAndRemoveTask();
		}
		}

core/proto/android/providers/settings/secure.proto

+2 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,8 @@ message SecureSettingsProto {
		// Setting for accessibility magnification for following typing.
		optional SettingProto accessibility_magnification_follow_typing_enabled = 43 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto contrast_level = 44 [ (android.privacy).dest = DEST_AUTOMATIC ];
		// Settings for font scaling
		optional SettingProto accessibility_font_scaling_has_been_changed = 51 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional Accessibility accessibility = 2;

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -1326,8 +1326,8 @@
		<string name="sms_control_yes" msgid="4858845109269524622">"Permet"</string>
		<string name="sms_control_no" msgid="4845717880040355570">"Denega"</string>
		<string name="sms_short_code_confirm_message" msgid="1385416688897538724">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> vol enviar un missatge a <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string>
		<string name="sms_short_code_details" msgid="2723725738333388351">"Aquesta acció "<b>"pot produir càrrecs"</b>" al teu compte per a mòbils."</string>
		<string name="sms_premium_short_code_details" msgid="1400296309866638111"><b>"Aquesta acció produirà càrrecs al teu compte per a mòbils."</b></string>
		<string name="sms_short_code_details" msgid="2723725738333388351">"Aquesta acció "<b>"pot produir càrrecs"</b>" al teu compte mòbil."</string>
		<string name="sms_premium_short_code_details" msgid="1400296309866638111"><b>"Aquesta acció produirà càrrecs al teu compte mòbil."</b></string>
		<string name="sms_short_code_confirm_allow" msgid="920477594325526691">"Envia"</string>
		<string name="sms_short_code_confirm_deny" msgid="1356917469323768230">"Cancel·la"</string>
		<string name="sms_short_code_remember_choice" msgid="1374526438647744862">"Recorda la meva selecció"</string>
		@@ -1366,7 +1366,7 @@
		<string name="usb_power_notification_message" msgid="7284765627437897702">"S\'està carregant el dispositiu connectat. Toca per veure més opcions."</string>
		<string name="usb_unsupported_audio_accessory_title" msgid="2335775548086533065">"S\'ha detectat un accessori d\'àudio analògic"</string>
		<string name="usb_unsupported_audio_accessory_message" msgid="1300168007129796621">"El dispositiu connectat no és compatible amb aquest telèfon. Toca per obtenir més informació."</string>
		<string name="adb_active_notification_title" msgid="408390247354560331">"Depuració per USB activada"</string>
		<string name="adb_active_notification_title" msgid="408390247354560331">"Depuració per USB connectada"</string>
		<string name="adb_active_notification_message" msgid="5617264033476778211">"Toca per desactivar la depuració per USB"</string>
		<string name="adb_active_notification_message" product="tv" msgid="6624498401272780855">"Selecciona per desactivar la depuració per USB"</string>
		<string name="adbwifi_active_notification_title" msgid="6147343659168302473">"S\'ha connectat la depuració sense fil"</string>