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

Commit 97f72ec9 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8408164 from 774394e2 to tm-release

Change-Id: I980308f002870e4b34eff09cd677fbda2b205a7b
parents 433eaaf1 774394e2
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@
        <activity android:name=".RespondViaSmsSettings"
             android:label="@string/respond_via_sms_setting_title"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:theme="@style/Theme.Telecom.DialerSettings"
             android:theme="@style/CallSettingsWithoutDividerTheme"
             android:process=":ui"
             android:exported="true">
            <intent-filter>
+5 −0
Original line number Diff line number Diff line
@@ -92,4 +92,9 @@
        <item name="android:lineSpacingExtra">@dimen/blocked_numbers_secondary_line_spacing</item>
        <item name="android:capitalize">sentences</item>
    </style>

    <style name="CallSettingsWithoutDividerTheme" parent="Theme.Telecom.DialerSettings">
        <item name="android:listDivider">@null</item>
    </style>

</resources>
+10 −0
Original line number Diff line number Diff line
@@ -944,6 +944,15 @@ public class InCallController extends CallsManagerListenerBase implements
        }
    };

    private final BroadcastReceiver mUserAddedReceiver = new BroadcastReceiver() {
        @Override
        public void onReceive(Context context, Intent intent) {
            if (Intent.ACTION_USER_ADDED.equals(intent.getAction())) {
                restrictPhoneCallOps();
            }
        }
    };

    private final SystemStateListener mSystemStateListener = new SystemStateListener() {
        @Override
        public void onCarModeChanged(int priority, String packageName, boolean isCarMode) {
@@ -1052,6 +1061,7 @@ public class InCallController extends CallsManagerListenerBase implements
        mSystemStateHelper.addListener(mSystemStateListener);
        mClockProxy = clockProxy;
        restrictPhoneCallOps();
        mContext.registerReceiver(mUserAddedReceiver, new IntentFilter(Intent.ACTION_USER_ADDED));
    }

    private void restrictPhoneCallOps() {