Merge "Update language to comply with Android's inclusive language guidance" am: a005cb30ed (3772a5b3) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -478,7 +478,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {

		private Intent putPhoneInfo(Intent intent, Bundle data, Boolean simInited) {
		int subscription = simInited
		? 1/* mock subid=1 */ : SubscriptionManager.DUMMY_SUBSCRIPTION_ID_BASE;
		? 1/* mock subid=1 */ : SubscriptionManager.PLACEHOLDER_SUBSCRIPTION_ID_BASE;
		if (data != null) intent.putExtras(data);

		intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subscription);

+3 −3

Original line number	Diff line number	Diff line
		@@ -111,11 +111,11 @@ import java.util.NoSuchElementException;
		* Change-Id: I450c968bda93767554b5188ee63e10c9f43c5aa4 fixes bugs 16148026
		* and 15973975 by saving the phoneId of the registrant and then using the
		* phoneId when deciding to to make a callback. This is necessary because
		* a subId changes from to a dummy value when a SIM is removed and thus won't
		* a subId changes from to a placeholder value when a SIM is removed and thus won't
		* compare properly. Because getPhoneIdFromSubId(int subId) handles
		* the dummy value conversion we properly do the callbacks.
		* the placeholder value conversion we properly do the callbacks.
		*
		* Eventually we may want to remove the notion of dummy value but for now this
		* Eventually we may want to remove the notion of placeholder value but for now this
		* looks like the best approach.
		*/
		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

+3 −3

Original line number	Diff line number	Diff line
		@@ -469,7 +469,7 @@ public final class Call {
		/**
		* When set for a call, indicates that this {@code Call} can be transferred to another
		* number.
		* Call supports the blind and assured call transfer feature.
		* Call supports the confirmed and unconfirmed call transfer feature.
		*
		* @hide
		*/
		@@ -1595,8 +1595,8 @@ public final class Call {
		* Instructs this {@code Call} to be transferred to another number.
		*
		* @param targetNumber The address to which the call will be transferred.
		* @param isConfirmationRequired if {@code true} it will initiate ASSURED transfer,
		* if {@code false}, it will initiate BLIND transfer.
		* @param isConfirmationRequired if {@code true} it will initiate a confirmed transfer,
		* if {@code false}, it will initiate an unconfirmed transfer.
		*
		* @hide
		*/

+1 −1

Original line number	Diff line number	Diff line
		@@ -393,7 +393,7 @@ public abstract class Connection extends Conferenceable {
		/**
		* Indicates that this {@code Connection} can be transferred to another
		* number.
		* Connection supports the blind and assured call transfer feature.
		* Connection supports the confirmed and unconfirmed call transfer feature.
		* @hide
		*/
		public static final int CAPABILITY_TRANSFER = 0x08000000;

+1 −0

Original line number	Diff line number	Diff line
		@@ -1864,6 +1864,7 @@ public abstract class ConnectionService extends Service {
		}
		mConferenceById.put(callId, conference);
		mIdByConference.put(conference, callId);

		conference.addListener(mConferenceListener);
		ParcelableConference parcelableConference = new ParcelableConference.Builder(
		request.getAccountHandle(), conference.getState())