Snap for 7804438 from 78c18a1b45 to sc-qpr1-release

Change-Id: I3779a75fa12ffb83cc91a04ea2d71f1b10e1b501
2021-10-08 01:08:00 +00:00
parent 2b3bc31976 78c18a1b45
commit 51dcfa291c
10 changed files with 101 additions and 19 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2220,6 +2220,7 @@
        </activity>

        <activity android:name=".bluetooth.BluetoothPairingDialog"
+                  android:permission="android.permission.BLUETOOTH_PRIVILEGED"
                  android:excludeFromRecents="true"
                  android:windowSoftInputMode="stateVisible|adjustResize"
                  android:theme="@style/Theme.AlertDialog"
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -4971,7 +4971,7 @@
      <item quantity="one">টা কেমেৰা এপ্‌</item>
      <item quantity="other">টা কেমেৰা এপ্‌</item>
    </plurals>
-    <string name="default_calendar_app_title" msgid="1870095225089706093">"কেলণ্ডাৰ এপ্"</string>
+    <string name="default_calendar_app_title" msgid="1870095225089706093">"Calendar এপ্"</string>
    <string name="default_contacts_app_title" msgid="7740028900741944569">"সম্পৰ্কসূচীৰ এপ্"</string>
    <plurals name="default_email_app_title" formatted="false" msgid="8338194872609410234">
      <item quantity="one">ইমেইল ক্লাইণ্ট এপসমূহ</item>
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1430,7 +1430,7 @@
    <string name="lift_to_wake_title" msgid="8994218158737714046">"Løft enheden for at vække den"</string>
    <string name="ambient_display_screen_title" msgid="8615947016991429325">"Aktiv låseskærm"</string>
    <string name="ambient_display_category_triggers" msgid="1216640141609270011">"Hvornår skal det vises"</string>
-    <string name="doze_title" msgid="1523090408230862316">"Væk skærmen for notifikationer"</string>
+    <string name="doze_title" msgid="1523090408230862316">"Væk skærmen ved notifikationer"</string>
    <string name="doze_summary" msgid="8252867381522942804">"Når skærmen er mørk, aktiveres den ved modtagelse af nye notifikationer"</string>
    <string name="doze_always_on_title" msgid="7326245192352868477">"Vis altid tidspunkt og info"</string>
    <string name="doze_always_on_summary" msgid="509097829739647852">"Øget batteriforbrug"</string>
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -3400,8 +3400,8 @@
    <string name="enhanced_4g_lte_mode_title" msgid="6624700245232361149">"VoLTE"</string>
    <string name="enhanced_4g_lte_mode_title_advanced_calling" msgid="7066009898031465265">"Advanced Calling"</string>
    <string name="enhanced_4g_lte_mode_title_4g_calling" msgid="7445853566718786195">"Panggilan 4G"</string>
-    <string name="enhanced_4g_lte_mode_summary" msgid="1067066329756036427">"Gunakan layanan LTE untuk meningkatkan panggilan suara (direkomendasikan)"</string>
-    <string name="enhanced_4g_lte_mode_summary_4g_calling" msgid="2575004054914178405">"Gunakan layanan 4G untuk meningkatkan panggilan suara (direkomendasikan)"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="1067066329756036427">"Gunakan layanan LTE untuk meningkatkan kualitas panggilan suara (direkomendasikan)"</string>
+    <string name="enhanced_4g_lte_mode_summary_4g_calling" msgid="2575004054914178405">"Gunakan layanan 4G untuk meningkatkan kualitas panggilan suara (direkomendasikan)"</string>
    <string name="nr_advanced_calling_title" msgid="6106286679535355939">"Vo5G"</string>
    <string name="nr_advanced_calling_summary" msgid="6926192539172030330">"Gunakan 5G untuk panggilan suara"</string>
    <string name="contact_discovery_opt_in_title" msgid="8708034790649773814">"Kirimkan kontak ke operator"</string>
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -2055,8 +2055,8 @@
    <string name="uninstall_text" msgid="315764653029060126">"Avinstaller"</string>
    <string name="uninstall_all_users_text" msgid="5924715251087176474">"Avinstaller for alle brukere"</string>
    <string name="install_text" msgid="4558333621516996473">"Installer"</string>
-    <string name="disable_text" msgid="5146002260857428005">"Slå av"</string>
-    <string name="enable_text" msgid="8570798764647110430">"Slå på"</string>
+    <string name="disable_text" msgid="5146002260857428005">"Deaktiver"</string>
+    <string name="enable_text" msgid="8570798764647110430">"Aktivér"</string>
    <string name="clear_user_data_text" msgid="6773186434260397947">"Tøm lagring"</string>
    <string name="app_factory_reset" msgid="8974044931667015201">"Avinstaller oppdateringer"</string>
    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Noen aktiviteter du har valgt, åpnes som standard i denne appen."</string>
@@ -3262,8 +3262,8 @@
    <string name="vpn_missing_cert" msgid="5397309964971068272">"Et sertifikat mangler. Prøv å redigere profilen."</string>
    <string name="trusted_credentials_system_tab" msgid="675362923690364722">"System"</string>
    <string name="trusted_credentials_user_tab" msgid="4978365619630094339">"Bruker"</string>
-    <string name="trusted_credentials_disable_label" msgid="6649583220519447947">"Slå av"</string>
-    <string name="trusted_credentials_enable_label" msgid="5551204878588237991">"Slå på"</string>
+    <string name="trusted_credentials_disable_label" msgid="6649583220519447947">"Deaktiver"</string>
+    <string name="trusted_credentials_enable_label" msgid="5551204878588237991">"Aktivér"</string>
    <string name="trusted_credentials_remove_label" msgid="8296330919329489422">"Avinstaller"</string>
    <string name="trusted_credentials_trust_label" msgid="4841047312274452474">"Angi som pålitelig"</string>
    <string name="trusted_credentials_enable_confirmation" msgid="6686528499458144754">"Vil du slå på systemets CA-sertifikat?"</string>
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -2251,7 +2251,7 @@
    <string name="configure_input_method" msgid="8831343065130376880">"ସେଟ୍‌ ଅପ୍‌ ଇନ୍‌ପୁଟ୍‌ ପଦ୍ଧତି"</string>
    <string name="input_method_settings" msgid="4177883733022569830">"ସେଟିଂସ୍"</string>
    <string name="input_method_settings_button" msgid="5145039044301426311">"ସେଟିଂସ୍"</string>
-    <string name="input_methods_settings_label_format" msgid="5809693308957109022">"<xliff:g id="IME_NAME">%1$s</xliff:g> ସେଟିଙ୍ଗ"</string>
+    <string name="input_methods_settings_label_format" msgid="5809693308957109022">"<xliff:g id="IME_NAME">%1$s</xliff:g> ସେଟିଂସ"</string>
    <string name="input_methods_and_subtype_enabler_title" msgid="8940326108334307057">"ସକ୍ରିୟ ଇନ୍‌ପୁଟ୍‌ ପଦ୍ଧତି ବାଛନ୍ତୁ"</string>
    <string name="onscreen_keyboard_settings_summary" msgid="3975358507879701606">"ଅନ୍‌ସ୍କ୍ରୀନ୍‌ କୀ’ବୋର୍ଡ ସେଟିଙ୍ଗ"</string>
    <string name="builtin_keyboard_settings_title" msgid="5096171620714179661">"ଫିଜିକଲ୍ କୀ’ବୋର୍ଡ"</string>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1900,7 +1900,7 @@
    <string name="location_low_battery_use" msgid="5218950289737996431">"Низкий расход заряда батареи"</string>
    <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Поиск сетей Wi‑Fi"</string>
    <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Разрешить приложениям и сервисам искать сети Wi-Fi, даже когда Wi-Fi отключен. Это может улучшить работу функций и сервисов, использующих данные о местоположении."</string>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Поиск Bluetooth-устройств"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Поиск устройств Bluetooth"</string>
    <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Разрешить приложениям и сервисам искать устройства поблизости, даже когда Bluetooth отключен. Это может улучшить работу функций и сервисов, использующих данные о местоположении."</string>
    <string name="location_services_preference_title" msgid="604317859531782159">"Геолокация"</string>
    <string name="location_services_screen_title" msgid="5640002489976602476">"Геолокация"</string>
@@ -5021,7 +5021,7 @@
    <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Нажмите, чтобы проверить планшет"</string>
    <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Нажмите, чтобы проверить устройство"</string>
    <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Чтобы увидеть время, уведомления и другую информацию, коснитесь экрана"</string>
-    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Экстренный вызов"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Экстренные вызовы"</string>
    <string name="emergency_gesture_switchbar_title" msgid="7421353963329899514">"Использовать функцию \"Экстренный вызов\""</string>
    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Под управлением приложения \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string>
    <string name="emergency_gesture_screen_summary" msgid="6640521030845132507">"Быстро нажмите кнопку питания не менее пяти раз для выполнения перечисленных ниже действий"</string>
--- a/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
+++ b/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
@@ -32,7 +32,9 @@ import androidx.fragment.app.FragmentManager;

 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.network.helper.ConfirmationSimDeletionPredicate;
 import com.android.settings.system.ResetDashboardFragment;
+import com.android.settings.wifi.dpp.WifiDppUtils;

 public class EraseEuiccDataDialogFragment extends InstrumentedDialogFragment implements
        DialogInterface.OnClickListener {
@@ -73,13 +75,24 @@ public class EraseEuiccDataDialogFragment extends InstrumentedDialogFragment imp
        }

        if (which == DialogInterface.BUTTON_POSITIVE) {
-            AsyncTask.execute(new Runnable() {
-                @Override
-                public void run() {
-                    RecoverySystem.wipeEuiccData(
-                            getContext(), PACKAGE_NAME_EUICC_DATA_MANAGEMENT_CALLBACK);
-                }
-            });
+            if (ConfirmationSimDeletionPredicate.getSingleton().test(getContext())) {
+                // Create a "verify it's you" verification over keyguard
+                // when "erase" button been pressed.
+                // This might protect from erasing by some automation process.
+                WifiDppUtils.showLockScreen(getContext(), () -> runAsyncWipe());
+            } else {
+                runAsyncWipe();
+            }
        }
    }
+
+    private void runAsyncWipe() {
+        AsyncTask.execute(new Runnable() {
+            @Override
+            public void run() {
+                RecoverySystem.wipeEuiccData(
+                        getContext(), PACKAGE_NAME_EUICC_DATA_MANAGEMENT_CALLBACK);
+            }
+        });
+    }
 }
--- a/src/com/android/settings/network/helper/ConfirmationSimDeletionPredicate.java
+++ b/src/com/android/settings/network/helper/ConfirmationSimDeletionPredicate.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.network.helper;
+
+import android.app.KeyguardManager;
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+
+import java.util.function.Predicate;
+
+/**
+ * {@link Predicate} for detecting the configuration of confirm SIM deletion.
+ */
+public class ConfirmationSimDeletionPredicate implements Predicate<Context> {
+
+    public static final String KEY_CONFIRM_SIM_DELETION = "confirm_sim_deletion";
+
+    private static final ConfirmationSimDeletionPredicate sSingleton =
+            new ConfirmationSimDeletionPredicate();
+
+    // Get singleton of this predicate
+    public static final ConfirmationSimDeletionPredicate getSingleton() {
+        return sSingleton;
+    }
+
+    /**
+     * Get default configuration of confirm SIM deletion.
+     *
+     * @param Context context
+     * @return the configuration of confirm SIM deletion
+     */
+    private static boolean getDefaultValue(Context context) {
+        return context.getResources()
+                .getBoolean(R.bool.config_sim_deletion_confirmation_default_on);
+    }
+
+    /**
+     * Get the configuration of confirm SIM deletion.
+     *
+     * @param Context context
+     * @return the configuration of confirm SIM deletion
+     */
+    public boolean test(Context context) {
+        final KeyguardManager keyguardManager = context.getSystemService(KeyguardManager.class);
+        if ((keyguardManager != null) && !keyguardManager.isKeyguardSecure()) {
+            return false;
+        }
+        return Settings.Global.getInt(context.getContentResolver(), KEY_CONFIRM_SIM_DELETION,
+                getDefaultValue(context) ? 1 : 0) == 1;
+    }
+}
--- a/src/com/android/settings/security/ConfirmSimDeletionPreferenceController.java
+++ b/src/com/android/settings/security/ConfirmSimDeletionPreferenceController.java
@@ -26,6 +26,7 @@ import androidx.preference.TwoStatePreference;

 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.network.helper.ConfirmationSimDeletionPredicate;
 import com.android.settings.network.telephony.MobileNetworkUtils;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wifi.dpp.WifiDppUtils;
@@ -34,7 +35,8 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 /** Enable/disable user confirmation before deleting an eSim */
 public class ConfirmSimDeletionPreferenceController extends BasePreferenceController implements
        Preference.OnPreferenceChangeListener{
-    public static final String KEY_CONFIRM_SIM_DELETION = "confirm_sim_deletion";
+    public static final String KEY_CONFIRM_SIM_DELETION =
+            ConfirmationSimDeletionPredicate.KEY_CONFIRM_SIM_DELETION;
    private boolean mConfirmationDefaultOn;
    private MetricsFeatureProvider mMetricsFeatureProvider;