commit 71527422814d138ec3561f3164b4828a43d7646e
author Daniel Nishi <dhnishi@google.com> Thu Jan 10 14:15:19 2019 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Mon Jan 21 02:15:23 2019 +0000
tree db868b71815e69839e088481d0f2e1a5b8d13349
parent 9fb12a994d5c2833452be3919711cde5007a4de3

Fix bug in warning activity intent.

Intents are no longer allowed to trigger without the NEW_TASK flag. This
old code path rotted and was never retrofitted to reflect this change.

By adding the flag in, this code path works again.

Bug: 122461924
Test: Manual
Change-Id: Idc825ebfedb795c02aefd61a202aefbea5bcd190
(cherry picked from commit a567233bca77f70b45a50f3972f00d1f0c6ce2c7)

src/com/android/storagemanager/automatic/NotificationController.java

diff --git a/src/com/android/storagemanager/automatic/NotificationController.java b/src/com/android/storagemanager/automatic/NotificationController.java
index 58c99d8..18e4533 100644
--- a/src/com/android/storagemanager/automatic/NotificationController.java
+++ b/src/com/android/storagemanager/automatic/NotificationController.java
@@ -98,12 +98,14 @@
     public void onReceive(Context context, Intent intent) {
         switch (intent.getAction()) {
             case INTENT_ACTION_ACTIVATE_ASM:
-                Settings.Secure.putInt(context.getContentResolver(),
+                Settings.Secure.putInt(
+                        context.getContentResolver(),
                         Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,
                         1);
                 // Provide a warning if storage manager is not defaulted on.
                 if (!SystemProperties.getBoolean(STORAGE_MANAGER_PROPERTY, false)) {
                     Intent warningIntent = new Intent(context, WarningDialogActivity.class);
+                    warningIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     context.startActivity(warningIntent);
                 }
                 break;