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

Commit 406fbe5d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Use Intent.EXTRA_REBROADCAST_ON_UNLOCK instead of hidden API" am:... 

Merge "Use Intent.EXTRA_REBROADCAST_ON_UNLOCK instead of hidden API" am: 92222839 am: 7961f0d5 am: 20e328e7

Change-Id: I9c19d1002e9f9feb1d88e54bcd630fd92e72cf68
parents 8f6ae979 20e328e7

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
                // keep compatibility with apps that aren't direct boot aware.

                // SysUI should just ignore this broadcast because it was already received

                // and processed previously.

                if (intent.getBooleanExtra(TelephonyIntents.EXTRA_REBROADCAST_ON_UNLOCK, false)) {

                if (intent.getBooleanExtra(Intent.EXTRA_REBROADCAST_ON_UNLOCK, false)) {

                    // Guarantee mTelephonyCapable state after SysUI crash and restart

                    if (args.simState == TelephonyManager.SIM_STATE_ABSENT) {

                        mHandler.obtainMessage(MSG_TELEPHONY_CAPABLE, true).sendToTarget();

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java

+1 −2
Original line number Diff line number Diff line
@@ -616,8 +616,7 @@ public class PhoneStatusBarPolicy 
                    break;

                case TelephonyIntents.ACTION_SIM_STATE_CHANGED:

                    // Avoid rebroadcast because SysUI is direct boot aware.

                    if (intent.getBooleanExtra(TelephonyIntents.EXTRA_REBROADCAST_ON_UNLOCK,

                            false)) {

                    if (intent.getBooleanExtra(Intent.EXTRA_REBROADCAST_ON_UNLOCK, false)) {

                        break;

                    }

                    updateSimState(intent);

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
                break;

            case TelephonyIntents.ACTION_SIM_STATE_CHANGED:

                // Avoid rebroadcast because SysUI is direct boot aware.

                if (intent.getBooleanExtra(TelephonyIntents.EXTRA_REBROADCAST_ON_UNLOCK, false)) {

                if (intent.getBooleanExtra(Intent.EXTRA_REBROADCAST_ON_UNLOCK, false)) {

                    break;

                }

                // Might have different subscriptions now.

packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        Assert.assertTrue("onSimStateChanged not called",

                mKeyguardUpdateMonitor.hasSimStateJustChanged());



        intent.putExtra(TelephonyIntents.EXTRA_REBROADCAST_ON_UNLOCK, true);

        intent.putExtra(Intent.EXTRA_REBROADCAST_ON_UNLOCK, true);

        mKeyguardUpdateMonitor.mBroadcastReceiver.onReceive(getContext(), intent);

        mTestableLooper.processAllMessages();

        Assert.assertFalse("onSimStateChanged should have been skipped",

telephony/java/com/android/internal/telephony/TelephonyIntents.java

+0 −2
Original line number Diff line number Diff line
@@ -180,8 +180,6 @@ public class TelephonyIntents { 
    public static final String ACTION_SIM_STATE_CHANGED

            = Intent.ACTION_SIM_STATE_CHANGED;



    public static final String EXTRA_REBROADCAST_ON_UNLOCK= "rebroadcastOnUnlock";



    /**

     * <p>Broadcast Action: It indicates the Emergency callback mode blocks datacall/sms

     * <p class="note">.