Merge "AOSP/Email and AOSP/UnfiedEmail - Added back call to uiaccounts. + Added android.permission.FOREGROUND_SERVICE for UnfiedEmail and changed the code accordingly to work with API level 28."
am: 700b46714c
Change-Id: I1bff1de17d751c170c9dbd228cfa1bdd3764f7c6
diff --git a/provider_src/com/android/email/provider/EmailProvider.java b/provider_src/com/android/email/provider/EmailProvider.java
index 9dd2d2e..aadc51b 100644
--- a/provider_src/com/android/email/provider/EmailProvider.java
+++ b/provider_src/com/android/email/provider/EmailProvider.java
@@ -1317,10 +1317,8 @@
uri.getQueryParameter(EmailContent.SUPPRESS_COMBINED_ACCOUNT_PARAM);
final boolean suppressCombined =
suppressParam != null && Boolean.parseBoolean(suppressParam);
- // TODO(rtenneti): Enable notifications.
- // c = uiAccounts(projection, suppressCombined);
- // return c;
- return null;
+ c = uiAccounts(projection, suppressCombined);
+ return c;
case UI_UNDO:
return uiUndo(projection);
case UI_SUBFOLDERS: