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

Commit f95eaf5c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add FLAG_RECEIVER_FOREGROUND to secret code broadcasts." am: 3d427d99 am: cb9a1d0f 

Change-Id: If8b016e2dd7136394ae4772b882060a2a89a64ef
parents 102b6dcb cb9a1d0f

src/java/com/android/internal/telephony/Phone.java

+4 −2
Original line number Diff line number Diff line
@@ -2585,7 +2585,8 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
            options.setBackgroundActivityStartsAllowed(true);

            Intent intent = new Intent(TelephonyIntents.SECRET_CODE_ACTION,

                    Uri.parse("android_secret_code://" + code));

            intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

            intent.addFlags(

                    Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND | Intent.FLAG_RECEIVER_FOREGROUND);

            mContext.sendBroadcast(intent, null, options.toBundle());



            // {@link TelephonyManager.ACTION_SECRET_CODE} will replace {@link
@@ -2593,7 +2594,8 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
            // that both of these two actions will be broadcast.

            Intent secrectCodeIntent = new Intent(TelephonyManager.ACTION_SECRET_CODE,

                    Uri.parse("android_secret_code://" + code));

            secrectCodeIntent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

            secrectCodeIntent.addFlags(

                    Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND | Intent.FLAG_RECEIVER_FOREGROUND);

            mContext.sendBroadcast(secrectCodeIntent, null, options.toBundle());

        }

    }