Snap for 7529132 from 20cab601c9 to sc-v2-release

Change-Id: I9a0a978cb91e11060f341356d50150dd0b1709e4

res/xml/security_dashboard_settings.xml

@@ -62,47 +62,6 @@
             settings:keywords="@string/keywords_biometric_settings" />
     </PreferenceCategory>
 
-    <!-- work profile security section -->
-    <PreferenceCategory
-        android:order="20"
-        android:key="security_category_profile"
-        android:title="@string/lock_settings_profile_title">
-
-        <!-- security_settings_unification -->
-        <com.android.settingslib.RestrictedSwitchPreference
-            android:key="unification"
-            android:title="@string/lock_settings_profile_unification_title"
-            android:summary="@string/lock_settings_profile_unification_summary"
-            settings:keywords="@string/keywords_unification" />
-
-        <com.android.settingslib.RestrictedPreference
-            android:key="unlock_set_or_change_profile"
-            android:title="@string/unlock_set_unlock_launch_picker_title_profile"
-            android:summary="@string/unlock_set_unlock_mode_pattern"
-            settings:keywords="@string/keywords_lockscreen" />
-
-        <SwitchPreference
-            android:key="visiblepattern_profile"
-            android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile"
-            settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />
-
-        <Preference
-            android:key="fingerprint_settings_profile"
-            android:title="@string/security_settings_fingerprint_preference_title"
-            android:summary="@string/summary_placeholder" />
-
-        <Preference
-            android:key="face_settings_profile"
-            android:title="@string/security_settings_face_preference_title"
-            android:summary="@string/summary_placeholder" />
-
-        <Preference
-            android:key="biometric_settings_profile"
-            android:title="@string/security_settings_biometric_preference_title"
-            android:summary="@string/summary_placeholder" />
-
-    </PreferenceCategory>
-
     <PreferenceCategory
         android:order="40"
         android:key="security_settings_device_admin_category"
@@ -170,4 +129,45 @@
         android:summary="@string/confirm_sim_deletion_description"
         settings:controller="com.android.settings.security.ConfirmSimDeletionPreferenceController"/>
 
+    <!-- work profile security section -->
+    <PreferenceCategory
+        android:order="100"
+        android:key="security_category_profile"
+        android:title="@string/lock_settings_profile_title">
+
+        <!-- security_settings_unification -->
+        <com.android.settingslib.RestrictedSwitchPreference
+            android:key="unification"
+            android:title="@string/lock_settings_profile_unification_title"
+            android:summary="@string/lock_settings_profile_unification_summary"
+            settings:keywords="@string/keywords_unification" />
+
+        <com.android.settingslib.RestrictedPreference
+            android:key="unlock_set_or_change_profile"
+            android:title="@string/unlock_set_unlock_launch_picker_title_profile"
+            android:summary="@string/unlock_set_unlock_mode_pattern"
+            settings:keywords="@string/keywords_lockscreen" />
+
+        <SwitchPreference
+            android:key="visiblepattern_profile"
+            android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile"
+            settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />
+
+        <Preference
+            android:key="fingerprint_settings_profile"
+            android:title="@string/security_settings_fingerprint_preference_title"
+            android:summary="@string/summary_placeholder" />
+
+        <Preference
+            android:key="face_settings_profile"
+            android:title="@string/security_settings_face_preference_title"
+            android:summary="@string/summary_placeholder" />
+
+        <Preference
+            android:key="biometric_settings_profile"
+            android:title="@string/security_settings_biometric_preference_title"
+            android:summary="@string/summary_placeholder" />
+
+    </PreferenceCategory>
+
 </PreferenceScreen>

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

@@ -26,8 +26,10 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.provider.DeviceConfig;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -39,6 +41,8 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settings.core.SettingsUIDeviceConfig;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
@@ -179,6 +183,18 @@ public class BluetoothDetailsCompanionAppsController extends BluetoothDetailsCon
      */
     public void updatePreferences(Context context,
             String address, PreferenceCategory container) {
+        // If the device is FastPair, remove CDM companion apps.
+        final BluetoothFeatureProvider bluetoothFeatureProvider = FeatureFactory.getFactory(context)
+                .getBluetoothFeatureProvider(context);
+        final boolean sliceEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI,
+                SettingsUIDeviceConfig.BT_SLICE_SETTINGS_ENABLED, true);
+        final Uri settingsUri = bluetoothFeatureProvider.getBluetoothDeviceSettingsUri(
+                mCachedDevice.getDevice());
+        if (sliceEnabled && settingsUri != null) {
+            container.removeAll();
+            return;
+        }
+
         Set<String> addedPackages = new HashSet<>();
 
         for (String packageName : getPreferencesNeedToShow(address, container)) {

src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java

@@ -18,6 +18,8 @@ package com.android.settings.password;
 
 import android.app.KeyguardManager;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.os.UserManager;
 import android.util.Log;
 import android.view.MenuItem;
@@ -163,11 +165,14 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
     @Override
     public void onDestroy() {
         super.onDestroy();
-        // Force a garbage collection immediately to remove remnant of user password shards
-        // from memory.
-        System.gc();
-        System.runFinalization();
-        System.gc();
+        // Force a garbage collection to remove remnant of user password shards from memory.
+        // Execute this with a slight delay to allow the activity lifecycle to complete and
+        // the instance to become gc-able.
+        new Handler(Looper.myLooper()).postDelayed(() -> {
+            System.gc();
+            System.runFinalization();
+            System.gc();
+        }, 5000);
     }
 
     @Override

src/com/android/settings/password/ConfirmLockPassword.java

@@ -25,6 +25,8 @@ import android.graphics.Typeface;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.CountDownTimer;
+import android.os.Handler;
+import android.os.Looper;
 import android.os.SystemClock;
 import android.os.UserManager;
 import android.os.storage.StorageManager;
@@ -216,11 +218,14 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
         public void onDestroy() {
             super.onDestroy();
             mPasswordEntry.setText(null);
-            // Force a garbage collection immediately to remove remnant of user password shards
-            // from memory.
-            System.gc();
-            System.runFinalization();
-            System.gc();
+            // Force a garbage collection to remove remnant of user password shards from memory.
+            // Execute this with a slight delay to allow the activity lifecycle to complete and
+            // the instance to become gc-able.
+            new Handler(Looper.myLooper()).postDelayed(() -> {
+                System.gc();
+                System.runFinalization();
+                System.gc();
+            }, 5000);
         }
 
         private int getDefaultHeader() {