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

Unverified Commit b2bcc950 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-security-16.0.0_r3' into staging/lineage-23.0_merge-android-security-16.0.0_r3 

Android security 16.0.0 release 3

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaS3ZNwAKCRDorT+BmrEO
# eDdBAJ42IKt8CWGsf/1l06l0XivnAqI3mgCdELHwcPGdoWxvdHWu7/0RvVy84/I=
# =FOqc
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Dec  1 20:06:47 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By Tyler Gunn (1) and arunvoddu (1)
# Via Android Build Coastguard Worker
* tag 'android-security-16.0.0_r3':
  [Telephony][Security Fix] Launch Browser only if device is unlocked.
  Remove get/set of voicemail ringtone uri in shared preferences.

Change-Id: I42545e7f7aa5426bdae29242f80f7ea6ae3d0db3
parents dc243038 13bb6797

src/java/com/android/internal/telephony/cat/CommandParamsFactory.java

+9 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static com.android.internal.telephony.cat.CatCmdMessage.SetupEventListCon 
import static com.android.internal.telephony.cat.CatCmdMessage.SetupEventListConstants.LANGUAGE_SELECTION_EVENT;

import static com.android.internal.telephony.cat.CatCmdMessage.SetupEventListConstants.USER_ACTIVITY_EVENT;



import android.app.KeyguardManager;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.res.Resources.NotFoundException;
@@ -95,6 +96,7 @@ public class CommandParamsFactory extends Handler { 
            UUID.fromString("c2b85688-516e-11ee-be56-0242ac120002");

    public static final String NPE_WHEN_CALLED_SEND_CMD_PARAMS_ERROR_MSG =

            "mCaller[RilMessageDecoder] is Null when called SendCmdParams";

    private Context mContext;

    /**

     * Returns a singleton instance of CommandParamsFactory

     * @param caller Class used for queuing raw ril messages, decoding them into
@@ -116,6 +118,7 @@ public class CommandParamsFactory extends Handler { 


    private CommandParamsFactory(RilMessageDecoder caller, IccFileHandler fh, Context context) {

        mCaller = caller;

        mContext = context;

        mIconLoader = IconLoader.getInstance(this, fh);

        try {

            mNoAlphaUsrCnf = context.getResources().getBoolean(
@@ -888,7 +891,12 @@ public class CommandParamsFactory extends Handler { 
     */

    private boolean processLaunchBrowser(CommandDetails cmdDet,

            List<ComprehensionTlv> ctlvs) throws ResultException {



        KeyguardManager keyguardManager = mContext.getSystemService(KeyguardManager.class);

        if (keyguardManager != null && keyguardManager.isDeviceLocked()) {

            CatLog.d(this, "The device is locked, cannot launch the Browser");

            throw new ResultException(ResultCode.LAUNCH_BROWSER_ERROR,

                    "The device is locked, unable to process the command.");

        }

        CatLog.d(this, "process LaunchBrowser");



        TextMessage confirmMsg = new TextMessage();

src/java/com/android/internal/telephony/cat/ResultException.java

+1 −2
Original line number Diff line number Diff line
@@ -34,13 +34,12 @@ public class ResultException extends CatException { 
    public ResultException(ResultCode result) {

        super();



        // ETSI TS 102 223, 8.12 -- For the general results '20', '21', '26',

        // ETSI TS 102 223, 8.12 -- For the general results '20', '21',

        // '38', '39', '3A', '3C', and '3D', it is mandatory for the terminal

        // to provide a specific cause value as additional information.

        switch (result) {

            case TERMINAL_CRNTLY_UNABLE_TO_PROCESS:    // 0x20

            case NETWORK_CRNTLY_UNABLE_TO_PROCESS:     // 0x21

            case LAUNCH_BROWSER_ERROR:                 // 0x26

            case MULTI_CARDS_CMD_ERROR:                // 0x38

            case USIM_CALL_CONTROL_PERMANENT:          // 0x39

            case BIP_ERROR:                            // 0x3a