Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e363ab9 authored by Michele Berionne's avatar Michele Berionne Committed by Automerger Merge Worker
Browse files

Merge changes from topic "sc_sim-pin-after-ota" into sc-dev am: 17373ec5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13431815

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c8e2ca55dd96cb8320bcdb3d64962682c57dc49
parents d933cdc6 17373ec5

core/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -40348,6 +40348,7 @@ package android.telephony { 
    field public static final String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";

    field public static final String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";

    field public static final String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";

    field public static final String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";

    field public static final String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool";

    field public static final String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool";

    field public static final String KEY_STORE_SIM_PIN_FOR_UNATTENDED_REBOOT_BOOL = "store_sim_pin_for_unattended_reboot_bool";

    field public static final String KEY_SUPPORTS_CALL_COMPOSER_BOOL = "supports_call_composer_bool";

    field public static final String KEY_SUPPORTS_CALL_COMPOSER_BOOL = "supports_call_composer_bool";

    field public static final String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool";

    field public static final String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool";

    field public static final String KEY_SUPPORT_ADD_CONFERENCE_PARTICIPANTS_BOOL = "support_add_conference_participants_bool";

    field public static final String KEY_SUPPORT_ADD_CONFERENCE_PARTICIPANTS_BOOL = "support_add_conference_participants_bool";

core/api/system-current.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -11869,6 +11869,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean matchesCurrentSimOperator(@NonNull String, int, @Nullable String);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean matchesCurrentSimOperator(@NonNull String, int, @Nullable String);

    method public boolean needsOtaServiceProvisioning();

    method public boolean needsOtaServiceProvisioning();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyOtaEmergencyNumberDbInstalled();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyOtaEmergencyNumberDbInstalled();

    method @RequiresPermission(android.Manifest.permission.REBOOT) public int prepareForUnattendedReboot();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean rebootRadio();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean rebootRadio();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void reportDefaultNetworkStatus(boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void reportDefaultNetworkStatus(boolean);

    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.MODIFY_PHONE_STATE}) public void requestCellInfoUpdate(@NonNull android.os.WorkSource, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback);

    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.MODIFY_PHONE_STATE}) public void requestCellInfoUpdate(@NonNull android.os.WorkSource, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback);
@@ -11993,6 +11994,9 @@ package android.telephony { 
    field public static final int NR_DUAL_CONNECTIVITY_DISABLE = 2; // 0x2

    field public static final int NR_DUAL_CONNECTIVITY_DISABLE = 2; // 0x2

    field public static final int NR_DUAL_CONNECTIVITY_DISABLE_IMMEDIATE = 3; // 0x3

    field public static final int NR_DUAL_CONNECTIVITY_DISABLE_IMMEDIATE = 3; // 0x3

    field public static final int NR_DUAL_CONNECTIVITY_ENABLE = 1; // 0x1

    field public static final int NR_DUAL_CONNECTIVITY_ENABLE = 1; // 0x1

    field public static final int PREPARE_UNATTENDED_REBOOT_ERROR = 2; // 0x2

    field public static final int PREPARE_UNATTENDED_REBOOT_PIN_REQUIRED = 1; // 0x1

    field public static final int PREPARE_UNATTENDED_REBOOT_SUCCESS = 0; // 0x0

    field public static final int RADIO_POWER_OFF = 0; // 0x0

    field public static final int RADIO_POWER_OFF = 0; // 0x0

    field public static final int RADIO_POWER_ON = 1; // 0x1

    field public static final int RADIO_POWER_ON = 1; // 0x1

    field public static final int RADIO_POWER_UNAVAILABLE = 2; // 0x2

    field public static final int RADIO_POWER_UNAVAILABLE = 2; // 0x2

core/res/res/values/config.xml

+6 −0
Original line number Original line Diff line number Diff line
@@ -4716,4 +4716,10 @@ 




    <!-- Whether to select voice/data/sms preference without user confirmation -->

    <!-- Whether to select voice/data/sms preference without user confirmation -->

    <bool name="config_voice_data_sms_auto_fallback">false</bool>

    <bool name="config_voice_data_sms_auto_fallback">false</bool>



    <!-- Whether to enable the one-handed keyguard on the lock screen for wide-screen devices. -->

    <bool name="config_enableOneHandedKeyguard">false</bool>



    <!-- Whether to allow the caching of the SIM PIN for verification after unattended reboot -->

    <bool name="config_allow_pin_storage_for_unattended_reboot">true</bool>

</resources>
 
</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -2647,6 +2647,7 @@ 
  <java-symbol type="bool" name="config_defaultWindowFeatureContextMenu" />

  <java-symbol type="bool" name="config_defaultWindowFeatureContextMenu" />

  <java-symbol type="bool" name="config_overrideRemoteViewsActivityTransition" />

  <java-symbol type="bool" name="config_overrideRemoteViewsActivityTransition" />

  <java-symbol type="attr" name="colorProgressBackgroundNormal" />

  <java-symbol type="attr" name="colorProgressBackgroundNormal" />

  <java-symbol type="bool" name="config_allow_pin_storage_for_unattended_reboot" />





  <java-symbol type="layout" name="simple_account_item" />

  <java-symbol type="layout" name="simple_account_item" />

  <java-symbol type="string" name="prohibit_manual_network_selection_in_gobal_mode" />

  <java-symbol type="string" name="prohibit_manual_network_selection_in_gobal_mode" />

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+16 −5
Original line number Original line Diff line number Diff line
@@ -67,6 +67,7 @@ import android.telephony.TelephonyManager; 
import android.util.EventLog;

import android.util.EventLog;

import android.util.Log;

import android.util.Log;

import android.util.Slog;

import android.util.Slog;

import android.util.SparseBooleanArray;

import android.util.SparseIntArray;

import android.util.SparseIntArray;

import android.view.IRemoteAnimationFinishedCallback;

import android.view.IRemoteAnimationFinishedCallback;

import android.view.RemoteAnimationTarget;

import android.view.RemoteAnimationTarget;
@@ -306,6 +307,13 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
     */

     */

    private final SparseIntArray mLastSimStates = new SparseIntArray();

    private final SparseIntArray mLastSimStates = new SparseIntArray();





    /**

     * Indicates if a SIM card had the SIM PIN enabled during the initialization, before

     * reaching the SIM_STATE_READY state. The flag is reset to false at SIM_STATE_READY.

     * Index is the slotId - in case of multiple SIM cards.

     */

    private final SparseBooleanArray mSimWasLocked = new SparseBooleanArray();



    private boolean mDeviceInteractive;

    private boolean mDeviceInteractive;

    private boolean mGoingToSleep;

    private boolean mGoingToSleep;
@@ -477,10 +485,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
                }

                }

            }

            }





            boolean simWasLocked;

            boolean lastSimStateWasLocked;

            synchronized (KeyguardViewMediator.this) {

            synchronized (KeyguardViewMediator.this) {

                int lastState = mLastSimStates.get(slotId);

                int lastState = mLastSimStates.get(slotId);

                simWasLocked = (lastState == TelephonyManager.SIM_STATE_PIN_REQUIRED

                lastSimStateWasLocked = (lastState == TelephonyManager.SIM_STATE_PIN_REQUIRED

                        || lastState == TelephonyManager.SIM_STATE_PUK_REQUIRED);

                        || lastState == TelephonyManager.SIM_STATE_PUK_REQUIRED);

                mLastSimStates.append(slotId, simState);

                mLastSimStates.append(slotId, simState);

            }

            }
@@ -504,17 +512,19 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
                        if (simState == TelephonyManager.SIM_STATE_ABSENT) {

                        if (simState == TelephonyManager.SIM_STATE_ABSENT) {

                            // MVNO SIMs can become transiently NOT_READY when switching networks,

                            // MVNO SIMs can become transiently NOT_READY when switching networks,

                            // so we should only lock when they are ABSENT.

                            // so we should only lock when they are ABSENT.

                            if (simWasLocked) {

                            if (lastSimStateWasLocked) {

                                if (DEBUG_SIM_STATES) Log.d(TAG, "SIM moved to ABSENT when the "

                                if (DEBUG_SIM_STATES) Log.d(TAG, "SIM moved to ABSENT when the "

                                        + "previous state was locked. Reset the state.");

                                        + "previous state was locked. Reset the state.");

                                resetStateLocked();

                                resetStateLocked();

                            }

                            }

                            mSimWasLocked.append(slotId, false);

                        }

                        }

                    }

                    }

                    break;

                    break;

                case TelephonyManager.SIM_STATE_PIN_REQUIRED:

                case TelephonyManager.SIM_STATE_PIN_REQUIRED:

                case TelephonyManager.SIM_STATE_PUK_REQUIRED:

                case TelephonyManager.SIM_STATE_PUK_REQUIRED:

                    synchronized (KeyguardViewMediator.this) {

                    synchronized (KeyguardViewMediator.this) {

                        mSimWasLocked.append(slotId, true);

                        if (!mShowing) {

                        if (!mShowing) {

                            if (DEBUG_SIM_STATES) Log.d(TAG,

                            if (DEBUG_SIM_STATES) Log.d(TAG,

                                    "INTENT_VALUE_ICC_LOCKED and keygaurd isn't "

                                    "INTENT_VALUE_ICC_LOCKED and keygaurd isn't "
@@ -541,9 +551,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
                case TelephonyManager.SIM_STATE_READY:

                case TelephonyManager.SIM_STATE_READY:

                    synchronized (KeyguardViewMediator.this) {

                    synchronized (KeyguardViewMediator.this) {

                        if (DEBUG_SIM_STATES) Log.d(TAG, "READY, reset state? " + mShowing);

                        if (DEBUG_SIM_STATES) Log.d(TAG, "READY, reset state? " + mShowing);

                        if (mShowing && simWasLocked) {

                        if (mShowing && mSimWasLocked.get(slotId, false)) {

                            if (DEBUG_SIM_STATES) Log.d(TAG, "SIM moved to READY when the "

                            if (DEBUG_SIM_STATES) Log.d(TAG, "SIM moved to READY when the "

                                    + "previous state was locked. Reset the state.");

                                    + "previously was locked. Reset the state.");

                            mSimWasLocked.append(slotId, false);

                            resetStateLocked();

                            resetStateLocked();

                        }

                        }

                    }

                    }