diff options
| author | Raman Tenneti <rtenneti@google.com> | 2019-08-15 14:37:50 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-15 14:37:50 -0700 |
| commit | 7f38a247501b3c1294f24fbd8fdaec2fcbb3022a (patch) | |
| tree | 04d4361c1b9122e392190dd2c9cf7b72349c3224 | |
| parent | 82f1577f479c3ccf00cc88b4d30406a253cd4b15 (diff) | |
| parent | 700b46714c96c269f4455eaa50c399cb858e8337 (diff) | |
| download | Email-7f38a247501b3c1294f24fbd8fdaec2fcbb3022a.tar.gz | |
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
| -rw-r--r-- | provider_src/com/android/email/provider/EmailProvider.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/provider_src/com/android/email/provider/EmailProvider.java b/provider_src/com/android/email/provider/EmailProvider.java index 9dd2d2ece..aadc51b0b 100644 --- a/provider_src/com/android/email/provider/EmailProvider.java +++ b/provider_src/com/android/email/provider/EmailProvider.java @@ -1317,10 +1317,8 @@ public class EmailProvider extends ContentProvider 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: |