diff options
| author | Raman Tenneti <rtenneti@google.com> | 2019-08-15 11:48:00 -0700 |
|---|---|---|
| committer | Raman Tenneti <rtenneti@google.com> | 2019-08-15 11:48:00 -0700 |
| commit | 6896a8d706142da9762847d425c2bc9f587962e3 (patch) | |
| tree | 20ab274b01072a21fa3835b96ed80a9743481c3e | |
| parent | 24beb9aa0a0618aa1d14d0465321b5f71cac11de (diff) | |
| download | UnifiedEmail-6896a8d706142da9762847d425c2bc9f587962e3.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: I6593b5dad3a5e79bba41a645f17e74af20d16a3c
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/mail/widget/BaseWidgetProvider.java | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e34a4fc1d..5dcd9888b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -25,6 +25,7 @@ <uses-permission android:name="com.android.email.permission.ACCESS_PROVIDER"/> <uses-permission android:name="com.android.email.permission.READ_ATTACHMENT"/> <uses-permission android:name="android.permission.NFC" /> + <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- This needs to be present when we are doing unbundled releases. --> <uses-sdk android:targetSdkVersion="28" android:minSdkVersion="14" /> diff --git a/src/com/android/mail/widget/BaseWidgetProvider.java b/src/com/android/mail/widget/BaseWidgetProvider.java index bbed266db..00eacd79b 100644 --- a/src/com/android/mail/widget/BaseWidgetProvider.java +++ b/src/com/android/mail/widget/BaseWidgetProvider.java @@ -214,6 +214,10 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider { @Override protected Void doInBackground(final Void... params) { + return null; + } + + protected Void onPostExecute(Boolean result) { for (int i = 0; i < mAppWidgetIds.length; ++i) { // Get the account for this widget from preference final String accountFolder = MailPrefs.get(mContext).getWidgetConfiguration( |