Snap for 6006841 from 903cd4ceed6719143cdc32e037b482c75a647937 to qt-qpr2-release (99557f45) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothCodecConfig.java

+91 −0

Original line number	Diff line number	Diff line
		@@ -440,6 +440,43 @@ public final class BluetoothCodecConfig implements Parcelable {
		return mCodecSpecific4;
		}

		/**
		* Checks whether a value set presented by a bitmask has zero or single bit
		*
		* @param valueSet the value set presented by a bitmask
		* @return true if the valueSet contains zero or single bit, otherwise false.
		*/
		private static boolean hasSingleBit(int valueSet) {
		return (valueSet == 0 \|\| (valueSet & (valueSet - 1)) == 0);
		}

		/**
		* Checks whether the object contains none or single sample rate.
		*
		* @return true if the object contains none or single sample rate, otherwise false.
		*/
		public boolean hasSingleSampleRate() {
		return hasSingleBit(mSampleRate);
		}

		/**
		* Checks whether the object contains none or single bits per sample.
		*
		* @return true if the object contains none or single bits per sample, otherwise false.
		*/
		public boolean hasSingleBitsPerSample() {
		return hasSingleBit(mBitsPerSample);
		}

		/**
		* Checks whether the object contains none or single channel mode.
		*
		* @return true if the object contains none or single channel mode, otherwise false.
		*/
		public boolean hasSingleChannelMode() {
		return hasSingleBit(mChannelMode);
		}

		/**
		* Checks whether the audio feeding parameters are same.
		*
		@@ -451,4 +488,58 @@ public final class BluetoothCodecConfig implements Parcelable {
		&& other.mBitsPerSample == mBitsPerSample
		&& other.mChannelMode == mChannelMode);
		}

		/**
		* Checks whether another codec config has the similar feeding parameters.
		* Any parameters with NONE value will be considered to be a wildcard matching.
		*
		* @param other the codec config to compare against
		* @return true if the audio feeding parameters are similar, otherwise false.
		*/
		public boolean similarCodecFeedingParameters(BluetoothCodecConfig other) {
		if (other == null \|\| mCodecType != other.mCodecType) {
		return false;
		}
		int sampleRate = other.mSampleRate;
		if (mSampleRate == BluetoothCodecConfig.SAMPLE_RATE_NONE
		\|\| sampleRate == BluetoothCodecConfig.SAMPLE_RATE_NONE) {
		sampleRate = mSampleRate;
		}
		int bitsPerSample = other.mBitsPerSample;
		if (mBitsPerSample == BluetoothCodecConfig.BITS_PER_SAMPLE_NONE
		\|\| bitsPerSample == BluetoothCodecConfig.BITS_PER_SAMPLE_NONE) {
		bitsPerSample = mBitsPerSample;
		}
		int channelMode = other.mChannelMode;
		if (mChannelMode == BluetoothCodecConfig.CHANNEL_MODE_NONE
		\|\| channelMode == BluetoothCodecConfig.CHANNEL_MODE_NONE) {
		channelMode = mChannelMode;
		}
		return sameAudioFeedingParameters(new BluetoothCodecConfig(
		mCodecType, /* priority */ 0, sampleRate, bitsPerSample, channelMode,
		/* specific1 / 0, / specific2 / 0, / specific3 */ 0,
		/* specific4 */ 0));
		}

		/**
		* Checks whether the codec specific parameters are the same.
		*
		* @param other the codec config to compare against
		* @return true if the codec specific parameters are the same, otherwise false.
		*/
		public boolean sameCodecSpecificParameters(BluetoothCodecConfig other) {
		if (other == null && mCodecType != other.mCodecType) {
		return false;
		}
		// Currently we only care about the LDAC Playback Quality at CodecSpecific1
		switch (mCodecType) {
		case SOURCE_CODEC_TYPE_LDAC:
		if (mCodecSpecific1 != other.mCodecSpecific1) {
		return false;
		}
		// fall through
		default:
		return true;
		}
		}
		}

core/java/android/bluetooth/BluetoothCodecStatus.java

+37 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,43 @@ public final class BluetoothCodecStatus implements Parcelable {
		return Arrays.asList(c1).containsAll(Arrays.asList(c2));
		}

		/**
		* Checks whether the codec config matches the selectable capabilities.
		* Any parameters of the codec config with NONE value will be considered a wildcard matching.
		*
		* @param codecConfig the codec config to compare against
		* @return true if the codec config matches, otherwise false
		*/
		public boolean isCodecConfigSelectable(BluetoothCodecConfig codecConfig) {
		if (codecConfig == null \|\| !codecConfig.hasSingleSampleRate()
		\|\| !codecConfig.hasSingleBitsPerSample() \|\| !codecConfig.hasSingleChannelMode()) {
		return false;
		}
		for (BluetoothCodecConfig selectableConfig : mCodecsSelectableCapabilities) {
		if (codecConfig.getCodecType() != selectableConfig.getCodecType()) {
		continue;
		}
		int sampleRate = codecConfig.getSampleRate();
		if ((sampleRate & selectableConfig.getSampleRate()) == 0
		&& sampleRate != BluetoothCodecConfig.SAMPLE_RATE_NONE) {
		continue;
		}
		int bitsPerSample = codecConfig.getBitsPerSample();
		if ((bitsPerSample & selectableConfig.getBitsPerSample()) == 0
		&& bitsPerSample != BluetoothCodecConfig.BITS_PER_SAMPLE_NONE) {
		continue;
		}
		int channelMode = codecConfig.getChannelMode();
		if ((channelMode & selectableConfig.getChannelMode()) == 0
		&& channelMode != BluetoothCodecConfig.CHANNEL_MODE_NONE) {
		continue;
		}
		return true;
		}
		return false;
		}


		@Override
		public int hashCode() {
		return Objects.hash(mCodecConfig, mCodecsLocalCapabilities,

core/java/android/util/DisplayMetrics.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -23,9 +23,8 @@ import android.os.SystemProperties;
		/**
		* A structure describing general information about a display, such as its
		* size, density, and font scaling.
		* <p>To access the DisplayMetrics members, initialize an object like this:</p>
		* <pre> DisplayMetrics metrics = new DisplayMetrics();
		* getWindowManager().getDefaultDisplay().getMetrics(metrics);</pre>
		* <p>To access the DisplayMetrics members, retrieve display metrics like this:</p>
		* <pre>context.getResources().getDisplayMetrics();</pre>
		*/
		public class DisplayMetrics {
		/**

packages/CarSystemUI/src/com/android/systemui/CarSystemUIFactory.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.content.Context;

		import com.android.internal.widget.LockPatternUtils;
		import com.android.keyguard.ViewMediatorCallback;
		import com.android.systemui.car.CarServiceProvider;
		import com.android.systemui.statusbar.car.CarFacetButtonController;
		import com.android.systemui.statusbar.car.CarStatusBarKeyguardViewManager;
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
		@@ -36,6 +37,7 @@ import dagger.Component;
		public class CarSystemUIFactory extends SystemUIFactory {

		private CarDependencyComponent mCarDependencyComponent;
		private CarServiceProvider mCarServiceProvider;

		@Override
		protected SystemUIRootComponent buildSystemUIRootComponent(Context context) {
		@@ -48,6 +50,14 @@ public class CarSystemUIFactory extends SystemUIFactory {
		.build();
		}

		/** Gets a {@link CarServiceProvider}. */
		public CarServiceProvider getCarServiceProvider(Context context) {
		if (mCarServiceProvider == null) {
		mCarServiceProvider = new CarServiceProvider(context);
		}
		return mCarServiceProvider;
		}

		public CarDependencyComponent getCarDependencyComponent() {
		return mCarDependencyComponent;
		}

packages/CarSystemUI/src/com/android/systemui/car/CarServiceProvider.java

0 → 100644

+59 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.systemui.car;

		import android.car.Car;
		import android.car.Car.CarServiceLifecycleListener;
		import android.content.Context;

		import java.util.ArrayList;
		import java.util.List;

		/**
		* Connects to the car service a single time for shared use across all of system ui.
		*/
		public class CarServiceProvider {

		private final Context mContext;
		private final List<CarServiceLifecycleListener> mListeners = new ArrayList<>();
		private Car mCar;

		public CarServiceProvider(Context context) {
		mContext = context;
		mCar = Car.createCar(mContext, /* handler= */ null, Car.CAR_WAIT_TIMEOUT_DO_NOT_WAIT,
		(car, ready) -> {
		mCar = car;

		synchronized (mListeners) {
		for (CarServiceLifecycleListener listener : mListeners) {
		listener.onLifecycleChanged(mCar, ready);
		}
		}
		});
		}

		/**
		* Let's other components hook into the connection to the car service. If we're already
		* connected
		* to the car service, the callback is immediately triggered.
		*/
		public void addListener(CarServiceLifecycleListener listener) {
		if (mCar.isConnected()) {
		listener.onLifecycleChanged(mCar, /* ready= */ true);
		}
		mListeners.add(listener);
		}
		}