Snap for 4767765 from ba0051a5b7376b3c861a8364c5dd9b7d31d49ebb to pi-release (23a0e774) · Commits · e / os / android_packages_modules_Bluetooth

android/app/res/values-da/strings_pbap.xml

+2 −2

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<resources xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"Indtast sessionsnøgle til %1$s"</string>
		<string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"Angiv sessionsnøgle til %1$s"</string>
		<string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Bluetooth-sessionsnøgle kræves"</string>
		<string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"Der var timeout ved forbindelsen med %1$s"</string>
		<string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"Der var timeout i indgangssessionnøgle med %1$s"</string>
		<string name="auth_notif_ticker" msgid="1575825798053163744">"Anmodning om Obex-godkendelse"</string>
		<string name="auth_notif_title" msgid="7599854855681573258">"Sessionstast"</string>
		<string name="auth_notif_message" msgid="6667218116427605038">"Indtast sessionsnøgle til %1$s"</string>
		<string name="auth_notif_message" msgid="6667218116427605038">"Angiv sessionsnøgle til %1$s"</string>
		<string name="defaultname" msgid="4821590500649090078">"Bilsæt"</string>
		<string name="unknownName" msgid="2841414754740600042">"Ukendt navn"</string>
		<string name="localPhoneName" msgid="2349001318925409159">"Mit navn"</string>

android/app/res/values-mr/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@
		<string name="bluetooth_map_settings_intro" msgid="6482369468223987562">"तुम्ही ब्लूटूथद्वारे सामायिक करू इच्छित असलेली खाती निवडा. कनेक्ट करताना अद्याप तुम्ही खात्यांमधील कोणताही अॅक्सेस स्वीकारण्याची आवश्यकता आहे."</string>
		<string name="bluetooth_map_settings_count" msgid="4557473074937024833">"स्लॉट शिल्लक:"</string>
		<string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"अॅप्लिकेशन आयकन"</string>
		<string name="bluetooth_map_settings_title" msgid="7420332483392851321">"ब्लूटूथ संदेश सामायिकरण सेटिंग्ज"</string>
		<string name="bluetooth_map_settings_title" msgid="7420332483392851321">"ब्लूटूथ मेसेज सामायिकरण सेटिंग्ज"</string>
		<string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"खाते निवडू शकत नाही. 0 स्लॉट शिल्लक"</string>
		<string name="bluetooth_connected" msgid="6718623220072656906">"ब्लूटूथ ऑडिओ कनेक्ट केला"</string>
		<string name="bluetooth_disconnected" msgid="3318303728981478873">"ब्लूटूथ ऑडिओ डिस्कनेक्ट केला"</string>

android/app/src/com/android/bluetooth/Utils.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -382,4 +382,13 @@ public final class Utils {
		throw new IllegalStateException("Not in BluetoothInstrumentationTest");
		}
		}

		/**
		* Get uid/pid string in a binder call
		*
		* @return "uid/pid=xxxx/yyyy"
		*/
		public static String getUidPidString() {
		return "uid/pid=" + Binder.getCallingUid() + "/" + Binder.getCallingPid();
		}
		}

android/app/src/com/android/bluetooth/hfp/HeadsetCallState.java

+22 −1

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		*/
		package com.android.bluetooth.hfp;

		import java.util.Objects;

		/**
		* A blob of data representing an overall call state on the phone
		*/
		@@ -59,7 +61,7 @@ class HeadsetCallState extends HeadsetMessageObject {
		.append(mNumActive)
		.append(", numHeld=")
		.append(mNumHeld)
		.append(", callState")
		.append(", callState=")
		.append(mCallState)
		.append(", number=");
		if (mNumber == null) {
		@@ -69,4 +71,23 @@ class HeadsetCallState extends HeadsetMessageObject {
		}
		builder.append(mNumber).append(", type=").append(mType).append("]");
		}

		@Override
		public boolean equals(Object object) {
		if (this == object) {
		return true;
		}
		if (!(object instanceof HeadsetCallState)) {
		return false;
		}
		HeadsetCallState that = (HeadsetCallState) object;
		return mNumActive == that.mNumActive && mNumHeld == that.mNumHeld
		&& mCallState == that.mCallState && Objects.equals(mNumber, that.mNumber)
		&& mType == that.mType;
		}

		@Override
		public int hashCode() {
		return Objects.hash(mNumActive, mNumHeld, mCallState, mNumber, mType);
		}
		}

android/app/src/com/android/bluetooth/hfp/HeadsetPhoneState.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -192,7 +192,8 @@ public class HeadsetPhoneState {
		return mNumActive;
		}

		void setNumActiveCall(int numActive) {
		@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
		public void setNumActiveCall(int numActive) {
		mNumActive = numActive;
		}

		@@ -200,7 +201,8 @@ public class HeadsetPhoneState {
		return mCallState;
		}

		void setCallState(int callState) {
		@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
		public void setCallState(int callState) {
		mCallState = callState;
		}

		@@ -208,7 +210,8 @@ public class HeadsetPhoneState {
		return mNumHeld;
		}

		void setNumHeldCall(int numHeldCall) {
		@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
		public void setNumHeldCall(int numHeldCall) {
		mNumHeld = numHeldCall;
		}

		@@ -225,6 +228,7 @@ public class HeadsetPhoneState {
		*
		* @param batteryLevel battery level value
		*/
		@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
		public void setCindBatteryCharge(int batteryLevel) {
		if (mCindBatteryCharge != batteryLevel) {
		mCindBatteryCharge = batteryLevel;