Snap for 12385180 from ac36a5303c6d274fcd9fc9c8a82fac8dd6883009 to 24Q4-release (5cdb4180) · Commits · e / os / android_packages_modules_Bluetooth

android/app/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -330,6 +330,7 @@ android_app {
		"-Xep:AndroidFrameworkBinderIdentity:ERROR",
		"-Xep:AndroidFrameworkEfficientParcelable:ERROR",
		"-Xep:AndroidFrameworkEfficientStrings:ERROR",
		"-Xep:AndroidFrameworkPendingIntentMutability:ERROR",
		"-Xep:AndroidFrameworkRequiresPermission:ERROR",
		"-Xep:BadImport:ERROR",
		"-Xep:CatchAndPrintStackTrace:ERROR",
		@@ -338,9 +339,11 @@ android_app {
		"-Xep:EmptyBlockTag:ERROR",
		"-Xep:EmptyCatch:ERROR",
		"-Xep:EqualsGetClass:ERROR",
		"-Xep:EqualsHashCode:ERROR",
		"-Xep:FallThrough:ERROR",
		"-Xep:Finalize:ERROR",
		"-Xep:HidingField:ERROR",
		"-Xep:InconsistentHashCode:ERROR",
		"-Xep:InlineMeInliner:ERROR",
		"-Xep:InvalidBlockTag:ERROR",
		"-Xep:InvalidParam:ERROR",

+1 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ public class Metadata implements Cloneable {
		@Override
		public int hashCode() {
		// Do not hash the Image as it does not implement hashCode
		return Objects.hash(mediaId, title, artist, album, trackNum, numTracks, genre, duration);
		return Objects.hash(title, artist, album, trackNum, numTracks, genre, duration);
		}

		@Override

+6 −2

Original line number	Diff line number	Diff line
		@@ -269,11 +269,10 @@ public class AvrcpItem {
		return true;
		}

		if (!(o instanceof AvrcpItem)) {
		if (!(o instanceof AvrcpItem other)) {
		return false;
		}

		AvrcpItem other = ((AvrcpItem) o);
		return Objects.equals(mUuid, other.getUuid())
		&& Objects.equals(mDevice, other.getDevice())
		&& mUid == other.getUid()
		@@ -293,6 +292,11 @@ public class AvrcpItem {
		&& Objects.equals(mImageUri, other.getCoverArtLocation());
		}

		@Override
		public int hashCode() {
		return Objects.hash(mUuid);
		}

		/** Builder for an AvrcpItem */
		public static class Builder {
		private static final String TAG = "AvrcpItem.Builder";

+5 −2

Original line number	Diff line number	Diff line
		@@ -246,9 +246,12 @@ public class BluetoothMediaBrowserService extends MediaBrowserServiceCompat {
		Intent launchIntent = new Intent();
		launchIntent.setAction(BluetoothPrefs.BLUETOOTH_SETTING_ACTION);
		launchIntent.addCategory(BluetoothPrefs.BLUETOOTH_SETTING_CATEGORY);
		int flags = PendingIntent.FLAG_UPDATE_CURRENT \| PendingIntent.FLAG_IMMUTABLE;
		PendingIntent pendingIntent =
		PendingIntent.getActivity(getApplicationContext(), 0, launchIntent, flags);
		PendingIntent.getActivity(
		getApplicationContext(),
		0,
		launchIntent,
		PendingIntent.FLAG_UPDATE_CURRENT \| PendingIntent.FLAG_IMMUTABLE);
		extras.putParcelable(ERROR_RESOLUTION_ACTION_INTENT, pendingIntent);
		PlaybackStateCompat errorState =
		new PlaybackStateCompat.Builder()

+8 −4

Original line number	Diff line number	Diff line
		@@ -357,12 +357,16 @@ public class BrowseTree {
		}

		@Override
		public boolean equals(Object other) {
		if (!(other instanceof BrowseNode)) {
		public boolean equals(Object obj) {
		if (!(obj instanceof BrowseNode other)) {
		return false;
		}
		BrowseNode otherNode = (BrowseNode) other;
		return getID().equals(otherNode.getID());
		return getID().equals(other.getID());
		}

		@Override
		public int hashCode() {
		return Objects.hash(getID());
		}

		public synchronized void toTreeString(int depth, StringBuilder sb) {