Snap for 6504394 from 8c20865e8a62a0e7e5bbaacb2edb7f2fe7f4b016 to mainline-release (ed2c64dc) · Commits · e / os / android_frameworks_base

core/res/res/values/config.xml

+15 −3

Original line number	Diff line number	Diff line
		@@ -4165,9 +4165,21 @@
		and a second time clipped to the fill level to indicate charge -->
		<bool name="config_batterymeterDualTone">false</bool>

		<!-- The default peak refresh rate for a given device. Change this value if you want to allow
		for higher refresh rates to be automatically used out of the box -->
		<integer name="config_defaultPeakRefreshRate">60</integer>
		<!-- The default refresh rate for a given device. Change this value to set a higher default
		refresh rate. If the hardware composer on the device supports display modes with a higher
		refresh rate than the default value specified here, the framework may use those higher
		refresh rate modes if an app chooses one by setting preferredDisplayModeId or calling
		setFrameRate().
		If a non-zero value is set for config_defaultPeakRefreshRate, then
		config_defaultRefreshRate may be set to 0, in which case the value set for
		config_defaultPeakRefreshRate will act as the default frame rate. -->
		<integer name="config_defaultRefreshRate">60</integer>

		<!-- The default peak refresh rate for a given device. Change this value if you want to prevent
		the framework from using higher refresh rates, even if display modes with higher refresh
		rates are available from hardware composer. Only has an effect if the value is
		non-zero. -->
		<integer name="config_defaultPeakRefreshRate">0</integer>

		<!-- The display uses different gamma curves for different refresh rates. It's hard for panel
		vendor to tune the curves to have exact same brightness for different refresh rate. So

core/res/res/values/symbols.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -3772,6 +3772,7 @@
		<java-symbol type="string" name="bluetooth_airplane_mode_toast" />

		<!-- For high refresh rate displays -->
		<java-symbol type="integer" name="config_defaultRefreshRate" />
		<java-symbol type="integer" name="config_defaultPeakRefreshRate" />
		<java-symbol type="integer" name="config_defaultRefreshRateInZone" />
		<java-symbol type="array" name="config_brightnessThresholdsOfPeakRefreshRate" />

packages/PrintSpooler/src/com/android/printspooler/ui/FusedPrintersProvider.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -231,11 +231,6 @@ public final class FusedPrintersProvider extends Loader<List<PrinterInfo>>
		// Add the new printers, i.e. what is left.
		printers.addAll(discoveredPrinters.values());

		// Do nothing if the printer list is not changed.
		if (Objects.equals(mPrinters, printers)) {
		return;
		}

		// Update the list of printers.
		mPrinters.clear();
		mPrinters.addAll(printers);

packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -381,6 +381,15 @@ public class LocalMediaManager implements BluetoothCallback {
		return mInfoMediaManager.getActiveMediaSession();
		}

		/**
		* Gets the current package name.
		*
		* @return current package name
		*/
		public String getPackageName() {
		return mPackageName;
		}

		private MediaDevice updateCurrentConnectedDevice() {
		synchronized (mMediaDevicesLock) {
		for (MediaDevice device : mMediaDevices) {

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -83,7 +83,16 @@ import java.util.concurrent.atomic.AtomicInteger;
		* <p>An AccessPoint, which would be more fittingly named "WifiNetwork", is an aggregation of
		* {@link ScanResult ScanResults} along with pertinent metadata (e.g. current connection info,
		* network scores) required to successfully render the network to the user.
		*
		* @deprecated WifiTracker/AccessPoint is no longer supported, and will be removed in a future
		* release. Clients that need a dynamic list of available wifi networks should migrate to one of the
		* newer tracker classes,
		* {@link com.android.wifitrackerlib.WifiPickerTracker},
		* {@link com.android.wifitrackerlib.SavedNetworkTracker},
		* {@link com.android.wifitrackerlib.NetworkDetailsTracker},
		* in conjunction with {@link com.android.wifitrackerlib.WifiEntry} to represent each wifi network.
		*/
		@Deprecated
		public class AccessPoint implements Comparable<AccessPoint> {
		static final String TAG = "SettingsLib.AccessPoint";