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

Commit 7e702767 authored by Hani Kazmi's avatar Hani Kazmi Committed by Automerger Merge Worker
Browse files

Merge "Allow BAL for HarmfulAppWarningActivity" into udc-dev am: 4df32135 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23214617



Change-Id: I5df959a9e3bf7d431b006cbb83c7f4ae50403f7f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ee5144fb 4df32135

core/java/com/android/internal/app/HarmfulAppWarningActivity.java

+7 −1
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.internal.app; 




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

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





import android.app.ActivityOptions;

import android.content.Context;

import android.content.Context;

import android.content.DialogInterface;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.Intent;
@@ -108,9 +109,14 @@ public class HarmfulAppWarningActivity extends AlertActivity implements 
                getPackageManager().setHarmfulAppWarning(mPackageName, null /*warning*/);

                getPackageManager().setHarmfulAppWarning(mPackageName, null /*warning*/);





                final IntentSender target = getIntent().getParcelableExtra(Intent.EXTRA_INTENT, android.content.IntentSender.class);

                final IntentSender target = getIntent().getParcelableExtra(Intent.EXTRA_INTENT, android.content.IntentSender.class);

                Bundle activityOptions =

                        ActivityOptions.makeBasic()

                                .setPendingIntentBackgroundActivityStartMode(

                                        ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED)

                                .toBundle();

                try {

                try {

                    startIntentSenderForResult(target, -1 /*requestCode*/, null /*fillInIntent*/,

                    startIntentSenderForResult(target, -1 /*requestCode*/, null /*fillInIntent*/,

                            0 /*flagsMask*/, 0 /*flagsValue*/, 0 /*extraFlags*/);

                            0 /*flagsMask*/, 0 /*flagsValue*/, 0 /*extraFlags*/, activityOptions);

                } catch (IntentSender.SendIntentException e) {

                } catch (IntentSender.SendIntentException e) {

                    Log.e(TAG, "Error while starting intent sender", e);

                    Log.e(TAG, "Error while starting intent sender", e);

                }

                }