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

Commit 7255b2ea authored by Matías Hernández's avatar Matías Hernández Committed by Android Build Coastguard Worker
Browse files

Remove incorrect call to Window.addFlags with a system flag 

The same flag is being (correctly) added in onCreate, so on top of being wrong this was also completely unnecessary.

Bug: 368579654
Test: atest NotificationAccessConfirmationActivityTest
Flag: EXEMPT bugfix

(cherry picked from commit e0510a62)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:824d46f313eb83c1d4a8ad48585dabf6763f5645)
Merged-In: I539fca77a1d136bdd0e4892993020884430b8a4e
Change-Id: I539fca77a1d136bdd0e4892993020884430b8a4e
parent 4a9cb946

src/com/android/settings/notification/NotificationAccessConfirmationActivity.java

+0 −15
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import android.os.UserManager; 
import android.service.notification.NotificationListenerService;

import android.text.TextUtils;

import android.util.Slog;

import android.view.WindowManager;

import android.view.accessibility.AccessibilityEvent;

import android.widget.Toast;
@@ -160,20 +159,6 @@ public class NotificationAccessConfirmationActivity extends Activity 
        getWindow().setCloseOnTouchOutside(false); 

    }



    @Override

    public void onResume() {

        super.onResume();

        getWindow().addFlags(

                WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

    }



    @Override

    public void onPause() {

        getWindow().clearFlags(

                WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        super.onPause();

    }



    private void onAllow() {

        mNm.setNotificationListenerAccessGranted(mComponentName, true);

tests/robotests/src/com/android/settings/notification/NotificationAccessConfirmationActivityTest.java

+15 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings.notification;



import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_COMPONENT_NAME;



import static com.google.common.truth.Truth.assertThat;
@@ -41,6 +43,19 @@ import org.robolectric.RuntimeEnvironment; 
@RunWith(RobolectricTestRunner.class)

public class NotificationAccessConfirmationActivityTest {



    @Test

    public void onCreate_setsWindowFlags() {

        ComponentName cn = new ComponentName("com.example", "com.example.SomeService");

        installPackage(cn.getPackageName(), "Example");



        NotificationAccessConfirmationActivity activity = startActivityWithIntent(cn);



        assertThat(activity.getWindow().getAttributes().privateFlags

                & SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS).isNotEqualTo(0);

        assertThat(activity.getWindow().getAttributes().flags

                & SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS).isEqualTo(0);

    }



    @Test

    public void start_withMissingIntentFilter_finishes() {

        ComponentName cn = new ComponentName("com.example", "com.example.SomeService");