Snap for 9075033 from f4d0d420bc9210d8e64babf8552c2cece4cb2c31 to tm-qpr1-release (724f0b3d) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/accessibility/HearingAidDialogFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ public class HearingAidDialogFragment extends InstrumentedDialogFragment {
		private void launchBluetoothAddDeviceSetting() {
		new SubSettingLauncher(getActivity())
		.setDestination(BluetoothPairingDetail.class.getName())
		.setSourceMetricsCategory(SettingsEnums.ACCESSIBILITY)
		.setSourceMetricsCategory(getMetricsCategory())
		.launch();
		}
		}

src/com/android/settings/applications/AppStateAppBatteryUsageBridge.java

+18 −9

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.content.Context;
		import android.os.Build;
		import android.util.Log;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.settingslib.applications.ApplicationsState;
		import com.android.settingslib.applications.ApplicationsState.AppEntry;
		import com.android.settingslib.applications.ApplicationsState.AppFilter;
		@@ -37,14 +38,21 @@ public class AppStateAppBatteryUsageBridge extends AppStateBaseBridge {
		private static final String TAG = AppStateAppBatteryUsageBridge.class.getSimpleName();
		static final boolean DEBUG = Build.IS_DEBUGGABLE;

		private final Context mContext;
		private final AppOpsManager mAppOpsManager;
		private final PowerAllowlistBackend mPowerAllowlistBackend;

		private static final int MODE_UNKNOWN = 0;
		private static final int MODE_UNRESTRICTED = 1;
		private static final int MODE_OPTIMIZED = 2;
		private static final int MODE_RESTRICTED = 3;
		@VisibleForTesting
		Context mContext;
		@VisibleForTesting
		AppOpsManager mAppOpsManager;
		@VisibleForTesting
		PowerAllowlistBackend mPowerAllowlistBackend;

		@VisibleForTesting
		static final int MODE_UNKNOWN = 0;
		@VisibleForTesting
		static final int MODE_UNRESTRICTED = 1;
		@VisibleForTesting
		static final int MODE_OPTIMIZED = 2;
		@VisibleForTesting
		static final int MODE_RESTRICTED = 3;

		@IntDef(
		prefix = {"MODE_"},
		@@ -110,8 +118,9 @@ public class AppStateAppBatteryUsageBridge extends AppStateBaseBridge {
		return new AppBatteryUsageDetails(mode);
		}

		@VisibleForTesting
		@OptimizationMode
		private static int getAppBatteryUsageDetailsMode(AppEntry entry) {
		static int getAppBatteryUsageDetailsMode(AppEntry entry) {
		if (entry == null \|\| entry.extraInfo == null) {
		return MODE_UNKNOWN;
		}

src/com/android/settings/applications/manageapplications/ManageApplications.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -1196,9 +1196,12 @@ public class ManageApplications extends InstrumentedFragment
		rebuild(R.id.sort_order_alpha, true);
		}
		return;
		} else if (mManageApplications.mListType == LIST_TYPE_BATTERY_OPTIMIZATION) {
		}

		if (mManageApplications.mListType == LIST_TYPE_BATTERY_OPTIMIZATION) {
		logAppBatteryUsage(filterType);
		}

		rebuild();
		}

		@@ -1673,7 +1676,7 @@ public class ManageApplications extends InstrumentedFragment
		holder.setSummary(AppLocaleDetails.getSummary(mContext, entry));
		break;
		case LIST_TYPE_BATTERY_OPTIMIZATION:
		holder.setSummary(R.string.app_battery_usage_summary);
		holder.setSummary(null);
		break;
		default:
		holder.updateSizeText(entry, mManageApplications.mInvalidSizeStr, mWhichSize);

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.text.method.LinkMovementMethod;
		import android.util.Log;
		import android.view.View;
		import android.widget.ImageView;
		import android.widget.ScrollView;
		import android.widget.TextView;

		import androidx.annotation.NonNull;
		@@ -123,6 +124,9 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
		final TextView footerTitle2 = findViewById(R.id.footer_title_2);
		footerTitle1.setText(getFooterTitle1());
		footerTitle2.setText(getFooterTitle2());

		final ScrollView scrollView = findViewById(R.id.sud_scroll_view);
		scrollView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
		}

		@Override

src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java

+52 −5

Original line number	Diff line number	Diff line
		@@ -53,6 +53,8 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont
		@VisibleForTesting
		AudioDeviceAttributes mAudioDevice;

		private boolean mIsAvailable;

		public BluetoothDetailsSpatialAudioController(
		Context context,
		PreferenceFragmentCompat fragment,
		@@ -61,16 +63,13 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont
		super(context, fragment, device, lifecycle);
		AudioManager audioManager = context.getSystemService(AudioManager.class);
		mSpatializer = audioManager.getSpatializer();
		mAudioDevice = new AudioDeviceAttributes(
		AudioDeviceAttributes.ROLE_OUTPUT,
		AudioDeviceInfo.TYPE_BLUETOOTH_A2DP,
		mCachedDevice.getAddress());
		getAvailableDevice();

		}

		@Override
		public boolean isAvailable() {
		return mSpatializer.isAvailableForDevice(mAudioDevice) ? true : false;
		return mIsAvailable;
		}

		@Override
		@@ -152,4 +151,52 @@ public class BluetoothDetailsSpatialAudioController extends BluetoothDetailsCont
		pref.setOnPreferenceClickListener(this);
		return pref;
		}

		private void getAvailableDevice() {
		AudioDeviceAttributes a2dpDevice = new AudioDeviceAttributes(
		AudioDeviceAttributes.ROLE_OUTPUT,
		AudioDeviceInfo.TYPE_BLUETOOTH_A2DP,
		mCachedDevice.getAddress());
		AudioDeviceAttributes bleHeadsetDevice = new AudioDeviceAttributes(
		AudioDeviceAttributes.ROLE_OUTPUT,
		AudioDeviceInfo.TYPE_BLE_HEADSET,
		mCachedDevice.getAddress());
		AudioDeviceAttributes bleSpeakerDevice = new AudioDeviceAttributes(
		AudioDeviceAttributes.ROLE_OUTPUT,
		AudioDeviceInfo.TYPE_BLE_SPEAKER,
		mCachedDevice.getAddress());
		AudioDeviceAttributes bleBroadcastDevice = new AudioDeviceAttributes(
		AudioDeviceAttributes.ROLE_OUTPUT,
		AudioDeviceInfo.TYPE_BLE_BROADCAST,
		mCachedDevice.getAddress());
		AudioDeviceAttributes hearingAidDevice = new AudioDeviceAttributes(
		AudioDeviceAttributes.ROLE_OUTPUT,
		AudioDeviceInfo.TYPE_HEARING_AID,
		mCachedDevice.getAddress());

		mIsAvailable = true;
		if (mSpatializer.isAvailableForDevice(bleHeadsetDevice)) {
		mAudioDevice = bleHeadsetDevice;
		} else if (mSpatializer.isAvailableForDevice(bleSpeakerDevice)) {
		mAudioDevice = bleSpeakerDevice;
		} else if (mSpatializer.isAvailableForDevice(bleBroadcastDevice)) {
		mAudioDevice = bleBroadcastDevice;
		} else if (mSpatializer.isAvailableForDevice(a2dpDevice)) {
		mAudioDevice = a2dpDevice;
		} else {
		mIsAvailable = mSpatializer.isAvailableForDevice(hearingAidDevice);
		mAudioDevice = hearingAidDevice;
		}

		Log.d(TAG, "getAvailableDevice() device : "
		+ mCachedDevice.getDevice().getAnonymizedAddress()
		+ ", type : " + mAudioDevice.getType()
		+ ", is available : " + mIsAvailable);
		}

		@VisibleForTesting
		void setAvailableDevice(AudioDeviceAttributes audioDevice) {
		mAudioDevice = audioDevice;
		mIsAvailable = mSpatializer.isAvailableForDevice(audioDevice);
		}
		}