Snap for 5726925 from 2ed8d99693784a9bd52e34b859d329103cbfd96f to rvc-release (29e68a80) · Commits · e / os / android_packages_modules_Bluetooth

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@
		<string name="bt_toast_4" msgid="4678812947604395649">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" hartzaileari fitxategia bidaltzen"</string>
		<string name="bt_toast_5" msgid="2846870992823019494">"\"<xliff:g id="RECIPIENT">%2$s</xliff:g>\" hartzaileari <xliff:g id="NUMBER">%1$s</xliff:g> fitxategi bidaltzen"</string>
		<string name="bt_toast_6" msgid="1855266596936622458">"\"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" hartzaileari fitxategia bidaltzeari utzi zaio."</string>
		<string name="bt_sm_2_1_nosdcard" msgid="1791835163301501637">"Ez dago \"<xliff:g id="SENDER">%1$s</xliff:g>\" erabiltzailearen fitxategia gordetzeko behar adina toki USB memorian"</string>
		<string name="bt_sm_2_1_nosdcard" msgid="1791835163301501637">"Ez dago \"<xliff:g id="SENDER">%1$s</xliff:g>\" erabiltzailearen fitxategia gordetzeko behar adina toki USB bidezko memorian"</string>
		<string name="bt_sm_2_1_default" msgid="9115512207909504071">"Ez dago \"<xliff:g id="SENDER">%1$s</xliff:g>\" erabiltzailearen fitxategia gordetzeko behar adina toki SD txartelean"</string>
		<string name="bt_sm_2_2" msgid="2965243265852680543">"Beharrezko memoria: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
		<string name="ErrorTooManyRequests" msgid="8578277541472944529">"Eskaera gehiegi prozesatzen ari dira. Saiatu berriro geroago."</string>
		@@ -95,7 +95,7 @@
		<string name="status_forbidden" msgid="613956401054050725">"Xede-gailuak transferentzia debekatu du."</string>
		<string name="status_canceled" msgid="6664490318773098285">"Erabiltzaileak bertan behera utzi du transferentzia."</string>
		<string name="status_file_error" msgid="3671917770630165299">"Memoria-arazoa."</string>
		<string name="status_no_sd_card_nosdcard" msgid="573631036356922221">"Ez dago USB memoriarik."</string>
		<string name="status_no_sd_card_nosdcard" msgid="573631036356922221">"Ez dago USB bidezko memoriarik."</string>
		<string name="status_no_sd_card_default" msgid="396564893716701954">"Ez dago SD txartelik. Transferitutako fitxategiak gordetzeko, sartu SD txartel bat."</string>
		<string name="status_connection_error" msgid="947681831523219891">"Ezin izan da konektatu."</string>
		<string name="status_protocol_error" msgid="3245444473429269539">"Ezin da eskaera behar bezala kudeatu."</string>

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

+0 −24

Original line number	Diff line number	Diff line
		@@ -401,20 +401,6 @@ public final class Utils {
		== PackageManager.PERMISSION_GRANTED;
		}

		public static boolean isLegacyForegroundApp(Context context, String pkgName) {
		return !isMApp(context, pkgName) && isForegroundApp(context, pkgName);
		}

		private static boolean isMApp(Context context, String pkgName) {
		try {
		return context.getPackageManager().getApplicationInfo(pkgName, 0).targetSdkVersion
		>= Build.VERSION_CODES.M;
		} catch (PackageManager.NameNotFoundException e) {
		// In case of exception, assume M app
		}
		return true;
		}

		public static boolean isQApp(Context context, String pkgName) {
		try {
		return context.getPackageManager().getApplicationInfo(pkgName, 0).targetSdkVersion
		@@ -424,16 +410,6 @@ public final class Utils {
		}
		return true;
		}
		/**
		* Return true if the specified package name is a foreground app.
		*
		* @param pkgName application package name.
		*/
		private static boolean isForegroundApp(Context context, String pkgName) {
		ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
		List<ActivityManager.RunningTaskInfo> tasks = am.getRunningTasks(1);
		return !tasks.isEmpty() && pkgName.equals(tasks.get(0).topActivity.getPackageName());
		}

		private static boolean isAppOppAllowed(AppOpsManager appOps, int op, String callingPackage) {
		return appOps.noteOp(op, Binder.getCallingUid(), callingPackage)

android/app/src/com/android/bluetooth/btservice/BondStateMachine.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -355,7 +355,7 @@ final class BondStateMachine extends StateMachine {
		intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
		// Workaround for Android Auto until pre-accepting pairing requests is added.
		intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
		mAdapterService.sendOrderedBroadcast(intent, mAdapterService.BLUETOOTH_ADMIN_PERM);
		mAdapterService.sendOrderedBroadcast(intent, AdapterService.BLUETOOTH_ADMIN_PERM);
		}

		@VisibleForTesting

android/app/src/com/android/bluetooth/map/BluetoothMapAccountLoader.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -185,7 +185,7 @@ public class BluetoothMapAccountLoader {
		return children;
		} finally {
		if (mProviderClient != null) {
		mProviderClient.release();
		mProviderClient.close();
		}
		}

android/app/src/com/android/bluetooth/map/BluetoothMapContentObserver.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1054,7 +1054,7 @@ public class BluetoothMapContentObserver {
		mResolver.unregisterContentObserver(mObserver);
		mObserverRegistered = false;
		if (mProviderClient != null) {
		mProviderClient.release();
		mProviderClient.close();
		mProviderClient = null;
		}
		}