Merge "Use PRIVACY_CONTROLS enum in PrivacyControlsFragment"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cf038cd..5494acf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8086,6 +8086,8 @@
<string name="memtag_reboot_no">Not now</string>
<!-- [CHAR LIMIT=NONE] Label for Learn More link. -->
<string name="memtag_learn_more">Learn more about Advanced memory protection.</string>
+ <!-- [CHAR LIMIT=NONE] Search keywords for Advanced memory protection option. -->
+ <string name="keywords_memtag" translatable="false">MTE, Memory Tagging Extension</string>
<!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
<string name="opening_paragraph_delete_profile_unknown_company">This work profile is managed by:</string>
diff --git a/res/xml/security_advanced_settings.xml b/res/xml/security_advanced_settings.xml
index c8ed6db..c489597 100644
--- a/res/xml/security_advanced_settings.xml
+++ b/res/xml/security_advanced_settings.xml
@@ -112,6 +112,7 @@
android:id="@+id/memtag_page"
android:key="memtag_page"
android:title="@string/memtag_title"
+ settings:keywords="@string/keywords_memtag"
android:fragment="com.android.settings.security.MemtagPage"
settings:controller="com.android.settings.security.MemtagPagePreferenceController" />
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingService.java b/src/com/android/settings/bluetooth/BluetoothPairingService.java
index 9883e61..d8487e4 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingService.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingService.java
@@ -99,11 +99,8 @@
Log.d(TAG, "Notification cancel " + " (" +
mDevice.getName() + ")");
mDevice.cancelBondProcess();
- } else {
- int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE,
- BluetoothDevice.ERROR);
- Log.d(TAG, "Dismiss pairing for " + " (" +
- mDevice.getName() + "), BondState: " + bondState);
+ } else { // BluetoothDevice.ACTION_PAIRING_CANCEL
+ Log.d(TAG, "Dismiss pairing for " + " (" + mDevice.getName() + ")");
}
mNm.cancel(NOTIFICATION_ID);