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

Commit 4d228b1c authored by Yong Zhang's avatar Yong Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add RECEIVER_NOT_EXPORTED flag for BiometricDanglingReceiver" into 24D1-dev

parents be48d784 ffa0c80a

services/core/java/com/android/server/biometrics/BiometricDanglingReceiver.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.server.biometrics;

package com.android.server.biometrics;





import static android.content.Intent.ACTION_CLOSE_SYSTEM_DIALOGS;

import static android.content.Intent.ACTION_CLOSE_SYSTEM_DIALOGS;

import static android.content.Intent.FLAG_RECEIVER_FOREGROUND;





import android.annotation.NonNull;

import android.annotation.NonNull;

import android.content.BroadcastReceiver;

import android.content.BroadcastReceiver;
@@ -63,7 +64,7 @@ public class BiometricDanglingReceiver extends BroadcastReceiver { 
            intentFilter.addAction(ACTION_FACE_RE_ENROLL_LAUNCH);

            intentFilter.addAction(ACTION_FACE_RE_ENROLL_LAUNCH);

            intentFilter.addAction(ACTION_FACE_RE_ENROLL_DISMISS);

            intentFilter.addAction(ACTION_FACE_RE_ENROLL_DISMISS);

        }

        }

        context.registerReceiver(this, intentFilter);

        context.registerReceiver(this, intentFilter, Context.RECEIVER_NOT_EXPORTED);

    }

    }





    @Override

    @Override
@@ -84,7 +85,8 @@ public class BiometricDanglingReceiver extends BroadcastReceiver { 
    }

    }





    private void launchBiometricEnrollActivity(Context context, String action) {

    private void launchBiometricEnrollActivity(Context context, String action) {

        context.sendBroadcast(new Intent(ACTION_CLOSE_SYSTEM_DIALOGS));

        context.sendBroadcast(

                new Intent(ACTION_CLOSE_SYSTEM_DIALOGS).setFlags(FLAG_RECEIVER_FOREGROUND));

        final Intent intent = new Intent(action);

        final Intent intent = new Intent(action);

        intent.setPackage(SETTINGS_PACKAGE);

        intent.setPackage(SETTINGS_PACKAGE);

        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

services/tests/servicestests/src/com/android/server/biometrics/BiometricDanglingReceiverTest.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;

import static org.mockito.Mockito.when;





import android.app.NotificationManager;

import android.app.NotificationManager;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.hardware.biometrics.BiometricsProtoEnums;

import android.hardware.biometrics.BiometricsProtoEnums;

import android.os.UserHandle;

import android.os.UserHandle;
@@ -75,13 +76,15 @@ public class BiometricDanglingReceiverTest { 
    @Test

    @Test

    public void testFingerprintRegisterReceiver() {

    public void testFingerprintRegisterReceiver() {

        initBroadcastReceiver(BiometricsProtoEnums.MODALITY_FINGERPRINT);

        initBroadcastReceiver(BiometricsProtoEnums.MODALITY_FINGERPRINT);

        verify(mContext).registerReceiver(eq(mBiometricDanglingReceiver), any());

        verify(mContext).registerReceiver(eq(mBiometricDanglingReceiver), any(),

                eq(Context.RECEIVER_NOT_EXPORTED));

    }

    }





    @Test

    @Test

    public void testFaceRegisterReceiver() {

    public void testFaceRegisterReceiver() {

        initBroadcastReceiver(BiometricsProtoEnums.MODALITY_FACE);

        initBroadcastReceiver(BiometricsProtoEnums.MODALITY_FACE);

        verify(mContext).registerReceiver(eq(mBiometricDanglingReceiver), any());

        verify(mContext).registerReceiver(eq(mBiometricDanglingReceiver), any(),

                eq(Context.RECEIVER_NOT_EXPORTED));

    }

    }





    @Test

    @Test