diff --git a/res/values/strings.xml b/res/values/strings.xml
index a72794dc4b5..9c713f60d64 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10564,7 +10564,7 @@
Allow launch on NFC scan
- Allow this app to launch when a NFC tag is scanned.\nIf this permission is on, the app will be available as an option whenever a tag is detected.
+ Allow this app to launch when an NFC tag is scanned.\nIf this permission is on, the app will be available as an option whenever a tag is detected.
Play media to
diff --git a/src/com/android/settings/bluetooth/BlockingPrefWithSliceController.java b/src/com/android/settings/bluetooth/BlockingPrefWithSliceController.java
index b443047d7e8..93a2747cac0 100644
--- a/src/com/android/settings/bluetooth/BlockingPrefWithSliceController.java
+++ b/src/com/android/settings/bluetooth/BlockingPrefWithSliceController.java
@@ -113,15 +113,27 @@ public class BlockingPrefWithSliceController extends BasePreferenceController im
@Override
public void onStart() {
- if (mLiveData != null) {
+ if (mLiveData == null) {
+ return;
+ }
+
+ try {
mLiveData.observeForever(this);
+ } catch (SecurityException e) {
+ Log.w(TAG, "observeForever - no permission");
}
}
@Override
public void onStop() {
- if (mLiveData != null) {
+ if (mLiveData == null) {
+ return;
+ }
+
+ try {
mLiveData.removeObserver(this);
+ } catch (SecurityException e) {
+ Log.w(TAG, "removeObserver - no permission");
}
}
diff --git a/src/com/android/settings/language/OnDeviceRecognitionPreferenceController.java b/src/com/android/settings/language/OnDeviceRecognitionPreferenceController.java
index 01f37b1f933..cd9f266cf90 100644
--- a/src/com/android/settings/language/OnDeviceRecognitionPreferenceController.java
+++ b/src/com/android/settings/language/OnDeviceRecognitionPreferenceController.java
@@ -16,9 +16,14 @@
package com.android.settings.language;
+import android.app.Dialog;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.UserInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.Nullable;
@@ -26,8 +31,12 @@ import androidx.preference.Preference;
import com.android.internal.R;
import com.android.settings.core.BasePreferenceController;
+import com.android.settings.dashboard.profileselector.ProfileSelectDialog;
+import com.android.settings.dashboard.profileselector.UserAdapter;
+import java.lang.ref.WeakReference;
import java.util.ArrayList;
+import java.util.List;
import java.util.Optional;
/** Controller of the On-device recognition preference. */
@@ -37,6 +46,8 @@ public class OnDeviceRecognitionPreferenceController extends BasePreferenceContr
private Optional mIntent;
+ private WeakReference