commit 851b49234761207a3827e2079edb19e829682ed1
author Darrell Shi <darrellshi@google.com> Wed Feb 02 15:06:38 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 02 15:06:38 2022 +0000
tree 45172300da866f020f3c574353f780057c5a7a47
parent ee729ac6824dfe04d3f510fc88efe52747524441
parent 547416749e6779df8f821b53ca8c6f03dde3e5d9

Merge "Settings for timeout to user 0 when docked."

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a654bcb..b02439e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -115,6 +115,7 @@
     <uses-permission android:name="android.permission.READ_APP_SPECIFIC_LOCALES" />
     <uses-permission android:name="android.permission.QUERY_ADMIN_POLICY" />
     <uses-permission android:name="android.permission.READ_SAFETY_CENTER_STATUS" />
+    <uses-permission android:name="android.permission.SEND_SAFETY_CENTER_UPDATE" />
     <uses-permission android:name="android.permission.START_VIEW_APP_FEATURES" />
 
     <application

src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java

diff --git a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
index d9d8737..15f47cf 100644
--- a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
+++ b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.sound;
 
-import static android.bluetooth.IBluetoothHearingAid.HI_SYNC_ID_INVALID;
+import static android.bluetooth.BluetoothHearingAid.HI_SYNC_ID_INVALID;
 
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;