diff options
| author | Raman Tenneti <rtenneti@google.com> | 2019-08-15 11:49:35 -0700 |
|---|---|---|
| committer | Raman Tenneti <rtenneti@google.com> | 2019-08-15 11:49:35 -0700 |
| commit | 658ec93b44283f65bb84a6efdd07943c0211e9fb (patch) | |
| tree | 04d4361c1b9122e392190dd2c9cf7b72349c3224 | |
| parent | 81b2fb9dcc5d55a4feebb932b4f3399992bf061b (diff) | |
| download | Email-658ec93b44283f65bb84a6efdd07943c0211e9fb.tar.gz | |
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.
Bug: 138276176
Bug: 119499886
Test: manual - Ran the following tests on Pixel phone. Tested the email UI.
$ make -j 40
$ make UnifiedEmail -j
$ make Email -j
$ make EmailTests -j
$ ls -l out/target/product/marlin/testcases/Email/arm64/Email.apk out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk
-rw-r--r-- 1 rtenneti primarygroup 6275529 Aug 15 11:33 out/target/product/marlin/testcases/Email/arm64/Email.apk
-rw-r--r-- 1 rtenneti primarygroup 389599 Aug 15 11:42 out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk
$ adb install -r -d -g out/target/product/marlin/testcases/Email/arm64/Email.apk
$ adb install -r -d -g out/target/product/marlin/testcases/EmailTests/arm64/EmailTests.apk
$ adb shell am instrument -w com.android.email.tests
Time: 6.543
OK (157 tests)
$ atest EmailTests
Summary
-------
EmailTests: Passed: 157, Failed: 0, Ignored: 0, Assumption Failed: 0
All tests passed!
Change-Id: Idd458f575c7c4b57a35c40c2ec7b8da048fbed72
| -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: |