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

Commit 2b3bbcf3 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [20069028] into security-aosp-rvc-release. 

Change-Id: I775f7cff16fce2c42d05a71e2594271657134960
parents 1d070e89 71516aab

AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ 
    <protected-broadcast android:name="android.intent.action.SHOW_MISSED_CALLS_NOTIFICATION" />

    <protected-broadcast android:name="android.intent.action.SHOW_MISSED_CALLS_NOTIFICATION" />

    <protected-broadcast android:name="com.android.server.telecom.MESSAGE_SENT" />

    <protected-broadcast android:name="com.android.server.telecom.MESSAGE_SENT" />





    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>





    <!-- Prevents the activity manager from delaying any activity-start

    <!-- Prevents the activity manager from delaying any activity-start

         requests by this package, including requests immediately after

         requests by this package, including requests immediately after

src/com/android/server/telecom/settings/EnableAccountPreferenceActivity.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -25,11 +25,15 @@ import android.telecom.Log; 
import android.telecom.PhoneAccountHandle;

import android.telecom.PhoneAccountHandle;

import android.telecom.TelecomManager;

import android.telecom.TelecomManager;

import android.view.MenuItem;

import android.view.MenuItem;

import android.view.WindowManager;





public class EnableAccountPreferenceActivity extends Activity {

public class EnableAccountPreferenceActivity extends Activity {

    @Override

    @Override

    public void onCreate(Bundle savedInstanceState) {

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        super.onCreate(savedInstanceState);

        getWindow().addSystemFlags(

                android.view.WindowManager.LayoutParams

                        .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);





        getFragmentManager().beginTransaction()

        getFragmentManager().beginTransaction()

                .replace(android.R.id.content, new EnableAccountPreferenceFragment())

                .replace(android.R.id.content, new EnableAccountPreferenceFragment())