diff options
| author | Raman Tenneti <rtenneti@google.com> | 2019-08-15 14:37:54 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-15 14:37:54 -0700 |
| commit | 8b71b9887b9e5ec1af3ff21c36d980ebbcf2b076 (patch) | |
| tree | fce228cd9da1c6c58291057b582bc05726587143 | |
| parent | def15d6ee59591ea7daf96100efcd0f1b580e174 (diff) | |
| parent | eb01557d8526191f1c47c4c76e56b0b43f3a5009 (diff) | |
| download | UnifiedEmail-8b71b9887b9e5ec1af3ff21c36d980ebbcf2b076.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."temp_140451723
am: eb01557d85
Change-Id: I455cb68c9797c4c98402ff61686b191fb983d425
| -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( |