Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0e4e158 authored Jul 31, 2020 by Tyler Gunn Committed by Automerger Merge Worker Jul 31, 2020

Merge "Update language to comply with Android's inclusive language guidance"...

Merge "Update language to comply with Android's inclusive language guidance" am: a005cb30 am: 3772a5b3 am: c5ef3b9c am: 03921ada am: dc822359

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377136

Change-Id: I99fa531f570a13fd3a27abf522383e631f86ceed

parents f0eb770c dc822359

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

+1 −1

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

	private Intent putPhoneInfo(Intent intent, Bundle data, Boolean simInited) {		private Intent putPhoneInfo(Intent intent, Bundle data, Boolean simInited) {
	int subscription = 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);		if (data != null) intent.putExtras(data);

	intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subscription);		intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subscription);

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -111,11 +111,11 @@ import java.util.NoSuchElementException;
	* Change-Id: I450c968bda93767554b5188ee63e10c9f43c5aa4 fixes bugs 16148026		* Change-Id: I450c968bda93767554b5188ee63e10c9f43c5aa4 fixes bugs 16148026
	* and 15973975 by saving the phoneId of the registrant and then using the		* 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		* 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		* 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.		* looks like the best approach.
	*/		*/
	@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)		@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

telecomm/java/android/telecom/Call.java

+3 −3

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

telecomm/java/android/telecom/Connection.java

+1 −1

Original line number	Original line	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		* Indicates that this {@code Connection} can be transferred to another
	* number.		* number.
	* Connection supports the blind and assured call transfer feature.		* Connection supports the confirmed and unconfirmed call transfer feature.
	* @hide		* @hide
	*/		*/
	public static final int CAPABILITY_TRANSFER = 0x08000000;		public static final int CAPABILITY_TRANSFER = 0x08000000;

telecomm/java/android/telecom/ConnectionService.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1880,6 +1880,7 @@ public abstract class ConnectionService extends Service {

	mConferenceById.put(callId, conference);		mConferenceById.put(callId, conference);
	mIdByConference.put(conference, callId);		mIdByConference.put(conference, callId);

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