diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-06-28 10:03:36 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-28 10:03:36 +0000 |
commit | 0d80873160283b6ab6ed3278e252e84d98487d99 (patch) | |
tree | c2ebc59cd52f241eab06152d62db4f5da820bb37 | |
parent | af3a1fc9f944c4abce88bc4271e9140276a8442e (diff) | |
parent | 883f025edc30febb9e439fd1430758f5eab4cf2f (diff) | |
download | Email-0d80873160283b6ab6ed3278e252e84d98487d99.tar.gz |
Merge "Revert "AOSP/Email - Changes for code to work with UnifiedEmail's version bump to the targetSdkVersion to 28 (maximum version). Used JobIntentservice API calls to replace context.startService for EmailBroadcastProcessorService."" into qt-dev
-rw-r--r-- | AndroidManifest.xml | 5 | ||||
-rw-r--r-- | provider_src/com/android/email/EmailIntentService.java | 6 | ||||
-rw-r--r-- | provider_src/com/android/email/service/EmailBroadcastProcessorService.java | 23 |
3 files changed, 14 insertions, 20 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9dd32c260..71648e805 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -486,9 +486,7 @@ </intent-filter> </receiver> <service - android:name=".service.EmailBroadcastProcessorService" - android:permission="android.permission.BIND_JOB_SERVICE" - android:exported="true" /> + android:name=".service.EmailBroadcastProcessorService" /> <!-- Support for DeviceAdmin / DevicePolicyManager. See SecurityPolicy class for impl. --> <receiver @@ -727,7 +725,6 @@ </service> <service android:name="com.android.email.EmailIntentService" - android:permission="android.permission.BIND_JOB_SERVICE" android:exported="false"> <intent-filter> <action android:name="com.android.mail.action.RESEND_NOTIFICATIONS" /> diff --git a/provider_src/com/android/email/EmailIntentService.java b/provider_src/com/android/email/EmailIntentService.java index 5924c90ce..0c6d76178 100644 --- a/provider_src/com/android/email/EmailIntentService.java +++ b/provider_src/com/android/email/EmailIntentService.java @@ -29,12 +29,12 @@ public class EmailIntentService extends MailIntentService { private static final String LOG_TAG = LogTag.getLogTag(); public EmailIntentService() { - super(); + super("EmailIntentService"); } @Override - protected void onHandleWork(final Intent intent) { - super.onHandleWork(intent); + protected void onHandleIntent(final Intent intent) { + super.onHandleIntent(intent); if (UIProvider.ACTION_UPDATE_NOTIFICATION.equals(intent.getAction())) { final NotificationController nc = diff --git a/provider_src/com/android/email/service/EmailBroadcastProcessorService.java b/provider_src/com/android/email/service/EmailBroadcastProcessorService.java index 5d264f007..7aa54673e 100644 --- a/provider_src/com/android/email/service/EmailBroadcastProcessorService.java +++ b/provider_src/com/android/email/service/EmailBroadcastProcessorService.java @@ -17,6 +17,7 @@ package com.android.email.service; import android.accounts.AccountManager; +import android.app.IntentService; import android.content.ComponentName; import android.content.ContentResolver; import android.content.ContentUris; @@ -33,8 +34,6 @@ import android.provider.ContactsContract; import android.text.TextUtils; import android.text.format.DateUtils; -import androidx.core.app.JobIntentService; - import com.android.email.EmailIntentService; import com.android.email.Preferences; import com.android.email.R; @@ -70,9 +69,7 @@ import java.util.Set; * This also handles the DeviceAdminReceiver in SecurityPolicy, because it is also * a BroadcastReceiver and requires the same processing semantics. */ -public class EmailBroadcastProcessorService extends JobIntentService { - public static final int JOB_ID = 200; - +public class EmailBroadcastProcessorService extends IntentService { // Action used for BroadcastReceiver entry point private static final String ACTION_BROADCAST = "broadcast_receiver"; @@ -84,11 +81,11 @@ public class EmailBroadcastProcessorService extends JobIntentService { private static final String ACTION_UPGRADE_BROADCAST = "upgrade_broadcast_receiver"; public EmailBroadcastProcessorService() { - super(); - } + // Class name will be the thread name. + super(EmailBroadcastProcessorService.class.getName()); - public static void enqueueWork(Context context, Intent work) { - enqueueWork(context, EmailBroadcastProcessorService.class, JOB_ID, work); + // Intent should be redelivered if the process gets killed before completing the job. + setIntentRedelivery(true); } /** @@ -98,13 +95,13 @@ public class EmailBroadcastProcessorService extends JobIntentService { Intent i = new Intent(context, EmailBroadcastProcessorService.class); i.setAction(ACTION_BROADCAST); i.putExtra(Intent.EXTRA_INTENT, broadcastIntent); - EmailBroadcastProcessorService.enqueueWork(context, i); + context.startService(i); } public static void processUpgradeBroadcastIntent(final Context context) { final Intent i = new Intent(context, EmailBroadcastProcessorService.class); i.setAction(ACTION_UPGRADE_BROADCAST); - EmailBroadcastProcessorService.enqueueWork(context, i); + context.startService(i); } /** @@ -116,11 +113,11 @@ public class EmailBroadcastProcessorService extends JobIntentService { Intent i = new Intent(context, EmailBroadcastProcessorService.class); i.setAction(ACTION_DEVICE_POLICY_ADMIN); i.putExtra(EXTRA_DEVICE_POLICY_ADMIN, message); - EmailBroadcastProcessorService.enqueueWork(context, i); + context.startService(i); } @Override - protected void onHandleWork(Intent intent) { + protected void onHandleIntent(Intent intent) { // This method is called on a worker thread. // Dispatch from entry point |