Merge "Allow BAL for HarmfulAppWarningActivity" into udc-dev
This commit is contained in:
@@ -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);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user