Snap for 6852881 from 1989311276e851a2e9c8dadc44481a665b2bf39d to rvc-qpr1-release (f668704c) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/UserInfo.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -220,6 +220,14 @@ public class UserInfo implements Parcelable {
		*/
		public boolean preCreated;

		/**
		* When {@code true}, it indicates this user was created by converting a {@link #preCreated}
		* user.
		*
		* <p><b>NOTE: </b>only used for debugging purposes, it's not set when marshalled to a parcel.
		*/
		public boolean convertedFromPreCreated;

		/**
		* Creates a UserInfo whose user type is determined automatically by the flags according to
		* {@link #getDefaultUserType}; can only be used for user types handled there.
		@@ -413,6 +421,7 @@ public class UserInfo implements Parcelable {
		lastLoggedInFingerprint = orig.lastLoggedInFingerprint;
		partial = orig.partial;
		preCreated = orig.preCreated;
		convertedFromPreCreated = orig.convertedFromPreCreated;
		profileGroupId = orig.profileGroupId;
		restrictedProfileParentId = orig.restrictedProfileParentId;
		guestToRemove = orig.guestToRemove;
		@@ -440,6 +449,7 @@ public class UserInfo implements Parcelable {
		+ ", type=" + userType
		+ ", flags=" + flagsToString(flags)
		+ (preCreated ? " (pre-created)" : "")
		+ (convertedFromPreCreated ? " (converted)" : "")
		+ (partial ? " (partial)" : "")
		+ "]";
		}

core/java/android/provider/Telephony.java

+10 −3

Original line number	Diff line number	Diff line
		@@ -3954,15 +3954,22 @@ public final class Telephony {
		public static final String APN_SET_ID = "apn_set_id";

		/**
		* Possible value for the {@link #APN_SET_ID} field. By default APNs will not belong to a
		* set. If the user manually selects an APN without apn set id, there is no need to
		* prioritize any specific APN set ids.
		* Possible value for the {@link #APN_SET_ID} field. By default APNs are added to set 0.
		* <p>Type: INTEGER</p>
		* @hide
		*/
		@SystemApi
		public static final int NO_APN_SET_ID = 0;

		/**
		* Possible value for the {@link #APN_SET_ID} field.
		* APNs with MATCH_ALL_APN_SET_ID will be used regardless of any set ids of
		* the selected APN.
		* <p>Type: INTEGER</p>
		* @hide
		*/
		public static final int MATCH_ALL_APN_SET_ID = -1;

		/**
		* A unique carrier id associated with this APN
		* {@see TelephonyManager#getSimCarrierId()}

core/java/android/view/InsetsState.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -453,9 +453,11 @@ public class InsetsState implements Parcelable {
		final ArraySet<Integer> result = new ArraySet<>();
		if ((types & Type.STATUS_BARS) != 0) {
		result.add(ITYPE_STATUS_BAR);
		result.add(ITYPE_CLIMATE_BAR);
		}
		if ((types & Type.NAVIGATION_BARS) != 0) {
		result.add(ITYPE_NAVIGATION_BAR);
		result.add(ITYPE_EXTRA_NAVIGATION_BAR);
		}
		if ((types & Type.CAPTION_BAR) != 0) {
		result.add(ITYPE_CAPTION_BAR);

core/res/res/values-b+sr+Latn/strings.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -241,7 +241,7 @@
		<string name="global_action_power_off" msgid="4404936470711393203">"Isključi"</string>
		<string name="global_action_power_options" msgid="1185286119330160073">"Napajanje"</string>
		<string name="global_action_restart" msgid="4678451019561687074">"Restartuj"</string>
		<string name="global_action_emergency" msgid="1387617624177105088">"Hitni poziv"</string>
		<string name="global_action_emergency" msgid="1387617624177105088">"Hitan poziv"</string>
		<string name="global_action_bug_report" msgid="5127867163044170003">"Izveštaj o grešci"</string>
		<string name="global_action_logout" msgid="6093581310002476511">"Završi sesiju"</string>
		<string name="global_action_screenshot" msgid="2610053466156478564">"Snimak ekrana"</string>
		@@ -832,7 +832,7 @@
		<string name="lockscreen_instructions_when_pattern_enabled" msgid="7982445492532123308">"Pritisnite „Meni“ da biste otključali telefon ili uputite hitan poziv."</string>
		<string name="lockscreen_instructions_when_pattern_disabled" msgid="7434061749374801753">"Pritisnite „Meni“ za otključavanje."</string>
		<string name="lockscreen_pattern_instructions" msgid="3169991838169244941">"Unesite šablon za otključavanje"</string>
		<string name="lockscreen_emergency_call" msgid="7549683825868928636">"Hitni poziv"</string>
		<string name="lockscreen_emergency_call" msgid="7549683825868928636">"Hitan poziv"</string>
		<string name="lockscreen_return_to_call" msgid="3156883574692006382">"Nazad na poziv"</string>
		<string name="lockscreen_pattern_correct" msgid="8050630103651508582">"Tačno!"</string>
		<string name="lockscreen_pattern_wrong" msgid="2940138714468358458">"Probajte ponovo"</string>

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1221,7 +1221,7 @@
		<string name="volume_music_hint_silent_ringtone_selected" msgid="1514829655029062233">"S\'ha establert el so de silenci"</string>
		<string name="volume_call" msgid="7625321655265747433">"Volum en trucada"</string>
		<string name="volume_bluetooth_call" msgid="2930204618610115061">"Volum en trucada per Bluetooth"</string>
		<string name="volume_alarm" msgid="4486241060751798448">"Volum de l\'alarma"</string>
		<string name="volume_alarm" msgid="4486241060751798448">"Volum d\'alarma"</string>
		<string name="volume_notification" msgid="6864412249031660057">"Volum de notificacions"</string>
		<string name="volume_unknown" msgid="4041914008166576293">"Volum"</string>
		<string name="volume_icon_description_bluetooth" msgid="7540388479345558400">"Volum del Bluetooth"</string>