Merge tag 'LA.QSSI.12.0.r1-07600-qssi.0' into sugisawa-mr1

"LA.QSSI.12.0.r1-07600-qssi.0"

Change-Id: Ia1bc5428e7944108b1f8473fd448203d3b53edeb

4 files changed, 37 insertions, 8 deletions

diff --git a/res/values/strings_ba.xml b/res/values/strings_ba.xml
index f24d9bba87..0673d1efbf 100644
--- a/res/values/strings_ba.xml
+++ b/res/values/strings_ba.xml
@@ -120,4 +120,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
        <xliff:g id="device_name">%1$s</xliff:g>.</string>
     <string-array name="bcast_channel_selection">
     </string-array>
+    <string name="metadata_synced">Metadata Synced</string>
+    <string name="metadata_not_synced">Metadata not synced</string>
+    <string name="audio_synced">Audio Synced</string>
+    <string name="audio_not_synced">Audio not synced</string>
 </resources>
diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
index 222a6ba241..9e86fa62ec 100644
--- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
@@ -126,12 +126,12 @@ public class BluetoothDashboardFragment extends DashboardFragment {
                 Class.forName("com.android.settings.bluetooth.BluetoothBroadcastEnableController");
             Constructor ctorPin, ctorEnable;
             ctorPin = classBroadcastPinController
-                          .getDeclaredConstructor(new Class[] {Context.class});
+                          .getDeclaredConstructor(new Class[] {Context.class, Lifecycle.class});
             ctorEnable = classBroadcastEnableController
-                .getDeclaredConstructor(new Class[] {Context.class, String.class});
-            Object objBroadcastPinController = ctorPin.newInstance(context);
+                .getDeclaredConstructor(new Class[] {Context.class, String.class, Lifecycle.class});
+            Object objBroadcastPinController = ctorPin.newInstance(context, getSettingsLifecycle());
             Object objBroadcastEnableController = ctorEnable
-                .newInstance(context, new String("bluetooth_screen_broadcast_enable"));
+                .newInstance(context, new String("bluetooth_screen_broadcast_enable"), getSettingsLifecycle());
             objBroadcastPinController.getClass().getMethod("setFragment", Fragment.class)
                 .invoke(objBroadcastPinController, (Fragment) this);
             controllers.add((AbstractPreferenceController) objBroadcastPinController);
diff --git a/src/com/android/settings/connecteddevice/NfcAndPaymentFragment.java b/src/com/android/settings/connecteddevice/NfcAndPaymentFragment.java
index 4ebc0cdccc..feb757f9e4 100644
--- a/src/com/android/settings/connecteddevice/NfcAndPaymentFragment.java
+++ b/src/com/android/settings/connecteddevice/NfcAndPaymentFragment.java
@@ -17,6 +17,12 @@
 package com.android.settings.connecteddevice;
 
 import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
+
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
@@ -54,5 +60,16 @@ public class NfcAndPaymentFragment extends DashboardFragment {
      * For Search.
      */
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.nfc_and_payment_settings);
+            new BaseSearchIndexProvider(R.xml.nfc_and_payment_settings) {
+            @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    final UserManager userManager = context.getSystemService(UserManager.class);
+                    final UserInfo myUserInfo = userManager.getUserInfo(UserHandle.myUserId());
+                    if (myUserInfo.isGuest()) {
+                        return false;
+                    }
+                    final PackageManager pm = context.getPackageManager();
+                    return pm.hasSystemFeature(PackageManager.FEATURE_NFC);
+                }
+            };
 }
diff --git a/src/com/android/settings/nfc/SecureNfcEnabler.java b/src/com/android/settings/nfc/SecureNfcEnabler.java
index 9acaf6461f..f31a382a57 100644
--- a/src/com/android/settings/nfc/SecureNfcEnabler.java
+++ b/src/com/android/settings/nfc/SecureNfcEnabler.java
@@ -18,9 +18,8 @@ package com.android.settings.nfc;
 
 import android.content.Context;
 import android.nfc.NfcAdapter;
-import android.provider.Settings;
+import android.os.UserManager;
 
-import androidx.annotation.VisibleForTesting;
 import androidx.preference.SwitchPreference;
 
 import com.android.settings.R;
@@ -32,10 +31,12 @@ import com.android.settings.R;
  */
 public class SecureNfcEnabler extends BaseNfcEnabler {
     private final SwitchPreference mPreference;
+    private final UserManager mUserManager;
 
     public SecureNfcEnabler(Context context, SwitchPreference preference) {
         super(context);
         mPreference = preference;
+        mUserManager = context.getSystemService(UserManager.class);
     }
 
     @Override
@@ -48,7 +49,7 @@ public class SecureNfcEnabler extends BaseNfcEnabler {
             case NfcAdapter.STATE_ON:
                 mPreference.setSummary(R.string.nfc_secure_toggle_summary);
                 mPreference.setChecked(mPreference.isChecked());
-                mPreference.setEnabled(true);
+                mPreference.setEnabled(isToggleable());
                 break;
             case NfcAdapter.STATE_TURNING_ON:
                 mPreference.setEnabled(false);
@@ -58,4 +59,11 @@ public class SecureNfcEnabler extends BaseNfcEnabler {
                 break;
         }
     }
+
+    private boolean isToggleable() {
+        if (mUserManager.isGuestUser()) {
+            return false;
+        }
+        return true;
+    }
 }