diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java index 416c2e4377..6d975a128d 100644 --- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java +++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java @@ -87,13 +87,8 @@ public class SampleChooserActivity extends Activity { } private void startDownloadServiceForeground() { - Intent serviceIntent = - new Intent(DownloadService.ACTION_INIT).setPackage("com.google.android.exoplayer2.demo"); - if (Util.SDK_INT >= 26) { - startForegroundService(serviceIntent); - } else { - startService(serviceIntent); - } + Intent intent = new Intent(DownloadService.ACTION_INIT).setPackage(getPackageName()); + Util.startForegroundService(this, intent); } private void onSampleGroups(final List groups, boolean sawError) { diff --git a/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java b/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java index 9232efaaa9..cc4d0e41a7 100644 --- a/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java +++ b/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java @@ -180,11 +180,7 @@ public final class JobDispatcherScheduler implements Scheduler { String servicePackage = extras.getString(SERVICE_PACKAGE); Intent intent = new Intent(serviceAction).setPackage(servicePackage); logd("starting service action: " + serviceAction + " package: " + servicePackage); - if (Util.SDK_INT >= 26) { - startForegroundService(intent); - } else { - startService(intent); - } + Util.startForegroundService(this, intent); } else { logd("requirements are not met"); jobFinished(params, /* needsReschedule */ true); diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java index e3db5e3bc6..342ac9f38a 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java @@ -405,11 +405,7 @@ public abstract class DownloadService extends Service { private void startServiceWithAction(String action) { Intent intent = new Intent(context, serviceClass).setAction(action); - if (Util.SDK_INT >= 26) { - context.startForegroundService(intent); - } else { - context.startService(intent); - } + Util.startForegroundService(context, intent); } } } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java index cd1e12520e..d60bfb2e82 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java @@ -175,11 +175,7 @@ public final class PlatformScheduler implements Scheduler { String servicePackage = extras.getString(SERVICE_PACKAGE); Intent intent = new Intent(serviceAction).setPackage(servicePackage); logd("starting service action: " + serviceAction + " package: " + servicePackage); - if (Util.SDK_INT >= 26) { - startForegroundService(intent); - } else { - startService(intent); - } + Util.startForegroundService(this, intent); } else { logd("requirements are not met"); jobFinished(params, /* needsReschedule */ true); diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java index 0a4a38697e..27630eac63 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java @@ -18,7 +18,9 @@ package com.google.android.exoplayer2.util; import android.Manifest.permission; import android.annotation.TargetApi; import android.app.Activity; +import android.content.ComponentName; import android.content.Context; +import android.content.Intent; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; @@ -128,6 +130,22 @@ public final class Util { return outputStream.toByteArray(); } + /** + * Calls {@link Context#startForegroundService(Intent)} if {@link #SDK_INT} is 26 or higher, or + * {@link Context#startService(Intent)} otherwise. + * + * @param context The context to call. + * @param intent The intent to pass to the called method. + * @return The result of the called method. + */ + public static ComponentName startForegroundService(Context context, Intent intent) { + if (Util.SDK_INT >= 26) { + return context.startForegroundService(intent); + } else { + return context.startService(intent); + } + } + /** * Checks whether it's necessary to request the {@link permission#READ_EXTERNAL_STORAGE} * permission read the specified {@link Uri}s, requesting the permission if necessary. diff --git a/library/ui/src/main/res/values-ar/strings.xml b/library/ui/src/main/res/values-ar/strings.xml index 6c364f12fe..7959af02d4 100644 --- a/library/ui/src/main/res/values-ar/strings.xml +++ b/library/ui/src/main/res/values-ar/strings.xml @@ -22,13 +22,13 @@ نص بدون اختيار تلقائي - Unknown + غير معروف %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps - %1$s, %2$s + قناة أحادية + استريو + صوت مجسّم + صوت مجسّم 5.1 + صوت مجسّم 7.1 + %1$.2f ميغابت في الثانية + %1$s، %2$s diff --git a/library/ui/src/main/res/values-bg/strings.xml b/library/ui/src/main/res/values-bg/strings.xml index 9ca3ecaebd..5c2bba41d8 100644 --- a/library/ui/src/main/res/values-bg/strings.xml +++ b/library/ui/src/main/res/values-bg/strings.xml @@ -22,13 +22,13 @@ Текст Нищо Автоматично - Unknown + Неизвестно %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps - %1$s, %2$s + Моно + Стерео + Обемен звук + 5,1-канален обемен звук + 7,1-канален обемен звук + %1$.2f Мб/сек + %1$s – %2$s diff --git a/library/ui/src/main/res/values-bs/strings.xml b/library/ui/src/main/res/values-bs/strings.xml index f8b0b5455d..7581106606 100644 --- a/library/ui/src/main/res/values-bs/strings.xml +++ b/library/ui/src/main/res/values-bs/strings.xml @@ -22,13 +22,13 @@ Tekst Ništa Automatski - Unknown + Nepoznato %1$d × %2$d Mono Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + Prostorno ozvučenje + Prostorno ozvučenje 5.1 + Prostorno ozvučenje 7.1 %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-fi/strings.xml b/library/ui/src/main/res/values-fi/strings.xml index 4418828548..8c444adf82 100644 --- a/library/ui/src/main/res/values-fi/strings.xml +++ b/library/ui/src/main/res/values-fi/strings.xml @@ -22,13 +22,13 @@ Teksti Automaattinen - Unknown + Tuntematon %1$d × %2$d Mono Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Surround-ääni + 5.1-surround-ääni + 7.1-surround-ääni + %1$.2f Mt/s %1$s, %2$s diff --git a/library/ui/src/main/res/values-hr/strings.xml b/library/ui/src/main/res/values-hr/strings.xml index 8c99e830d7..ad570acc05 100644 --- a/library/ui/src/main/res/values-hr/strings.xml +++ b/library/ui/src/main/res/values-hr/strings.xml @@ -22,13 +22,13 @@ Tekst Ništa Automatski - Unknown + Nepoznato %1$d × %2$d Mono Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + Okružujući zvuk + 5.1-kanalni okružujući zvuk + 7.1-kanalni okružujući zvuk %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-ja/strings.xml b/library/ui/src/main/res/values-ja/strings.xml index 9e47df4074..d000e89586 100644 --- a/library/ui/src/main/res/values-ja/strings.xml +++ b/library/ui/src/main/res/values-ja/strings.xml @@ -22,13 +22,13 @@ SMS なし 自動 - Unknown + 不明 %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + モノラル + ステレオ + サラウンド サウンド + 5.1 サラウンド サウンド + 7.1 サラウンド サウンド %1$.2f Mbps - %1$s, %2$s + %1$s、%2$s diff --git a/library/ui/src/main/res/values-kk/strings.xml b/library/ui/src/main/res/values-kk/strings.xml index a1f8e51525..5c719ad883 100644 --- a/library/ui/src/main/res/values-kk/strings.xml +++ b/library/ui/src/main/res/values-kk/strings.xml @@ -22,13 +22,13 @@ Мәтін Ешқайсысы Автоматты - Unknown + Белгісіз %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Моно + Стерео + Көлемді дыбыс + 5.1 көлемді дыбыс жүйесі + 7.1 көлемді дыбыс жүйесі + %1$.2f МБ/сек %1$s, %2$s diff --git a/library/ui/src/main/res/values-ko/strings.xml b/library/ui/src/main/res/values-ko/strings.xml index 62e0a66b85..74488f037d 100644 --- a/library/ui/src/main/res/values-ko/strings.xml +++ b/library/ui/src/main/res/values-ko/strings.xml @@ -22,13 +22,13 @@ 문자 메시지 없음 자동 - Unknown - %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + 알 수 없음 + %1$d×%2$d + 모노 + 스테레오 + 서라운드 사운드 + 5.1 서라운드 사운드 + 7.1 서라운드 사운드 + %1$.2fMbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-lo/strings.xml b/library/ui/src/main/res/values-lo/strings.xml index 70e8272a08..bd2efa6684 100644 --- a/library/ui/src/main/res/values-lo/strings.xml +++ b/library/ui/src/main/res/values-lo/strings.xml @@ -22,13 +22,13 @@ ຂໍ້ຄວາມ ບໍ່ມີ ອັດຕະໂນມັດ - Unknown + ບໍ່ຮູ້ຈັກ %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + ໂມໂນ + ສະເຕຣິໂອ + ສຽງຮອບທິດທາງ + ສຽງຮອບທິດທາງ 5.1 + ສຽງຮອບທິດທາງ 7.1 %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-mk/strings.xml b/library/ui/src/main/res/values-mk/strings.xml index 4b6f0efd38..4be2c6b5c5 100644 --- a/library/ui/src/main/res/values-mk/strings.xml +++ b/library/ui/src/main/res/values-mk/strings.xml @@ -22,13 +22,13 @@ Текст Нема Автоматскa - Unknown + Непозната %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Моно + Стерео + Опкружувачки звук + 5.1 опкружувачки звук + 7.1 опкружувачки звук + %1$.2f Mб/с %1$s, %2$s diff --git a/library/ui/src/main/res/values-mn/strings.xml b/library/ui/src/main/res/values-mn/strings.xml index 1b87d7cdd5..96265481fe 100644 --- a/library/ui/src/main/res/values-mn/strings.xml +++ b/library/ui/src/main/res/values-mn/strings.xml @@ -22,13 +22,13 @@ Текст Байхгүй Автомат - Unknown + Үл мэдэгдэх %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + Моно + Стерео + Орчин тойрны дуу + 5.1 орчин тойрны дуу + 7.1 орчин тойрны дуу %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-ru/strings.xml b/library/ui/src/main/res/values-ru/strings.xml index b52f6b1a64..da835409cc 100644 --- a/library/ui/src/main/res/values-ru/strings.xml +++ b/library/ui/src/main/res/values-ru/strings.xml @@ -22,13 +22,13 @@ Текст Нет Авто - Unknown - %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Неизвестный трек + %1$d × %2$d + Моно + Стерео + Объемный звук + Система объемного звука 5.1 + Система объемного звука 7.1 + %1$.2f Мбит/сек %1$s, %2$s diff --git a/library/ui/src/main/res/values-sl/strings.xml b/library/ui/src/main/res/values-sl/strings.xml index d16e99ac47..e57a6b03a4 100644 --- a/library/ui/src/main/res/values-sl/strings.xml +++ b/library/ui/src/main/res/values-sl/strings.xml @@ -22,13 +22,13 @@ Podnapisi Nič Samodejno - Unknown + Neznano %1$d × %2$d Mono Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Prostorski zvok + Prostorski zvok 5.1 + Prostorski zvok 7.1 + %1$.2f Mb/s %1$s, %2$s diff --git a/library/ui/src/main/res/values-sq/strings.xml b/library/ui/src/main/res/values-sq/strings.xml index 18f6632f7d..185ed32815 100644 --- a/library/ui/src/main/res/values-sq/strings.xml +++ b/library/ui/src/main/res/values-sq/strings.xml @@ -22,13 +22,13 @@ Tekst Asnjë Automatike - Unknown + E panjohur %1$d × %2$d Mono Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + Tingulli rrethues + Tingull rrethues 5.1 + Tingull rrethues 7.1 %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-sv/strings.xml b/library/ui/src/main/res/values-sv/strings.xml index d0540a93a4..94b3b3b6e6 100644 --- a/library/ui/src/main/res/values-sv/strings.xml +++ b/library/ui/src/main/res/values-sv/strings.xml @@ -22,13 +22,13 @@ Text Ingen Automatiskt - Unknown + Okänt %1$d × %2$d Mono Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Surroundljud + 5.1-kanaligt surroundljud + 7.1-kanaligt surroundljud + %1$.2f Mbit/s %1$s, %2$s diff --git a/library/ui/src/main/res/values-tl/strings.xml b/library/ui/src/main/res/values-tl/strings.xml index a8b082b43a..de9b07e5aa 100644 --- a/library/ui/src/main/res/values-tl/strings.xml +++ b/library/ui/src/main/res/values-tl/strings.xml @@ -22,13 +22,13 @@ Text Wala Awtomatiko - Unknown + Hindi Alam %1$d × %2$d Mono Stereo Surround sound - 5.1 surround sound - 7.1 surround sound + 5.1 na surround sound + 7.1 na surround sound %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-vi/strings.xml b/library/ui/src/main/res/values-vi/strings.xml index ecc1cb5608..d79ce2701b 100644 --- a/library/ui/src/main/res/values-vi/strings.xml +++ b/library/ui/src/main/res/values-vi/strings.xml @@ -22,13 +22,13 @@ Văn bản Không Tự động - Unknown + Không xác định %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Đơn âm + Âm thanh nổi + Âm thanh vòm + Âm thanh vòm 5.1 + Âm thanh vòm 7.1 + %1$.2f Mb/giây %1$s, %2$s diff --git a/library/ui/src/main/res/values-zh-rHK/strings.xml b/library/ui/src/main/res/values-zh-rHK/strings.xml index 05b546c9dd..a13dcb0cb0 100644 --- a/library/ui/src/main/res/values-zh-rHK/strings.xml +++ b/library/ui/src/main/res/values-zh-rHK/strings.xml @@ -22,13 +22,13 @@ 文字 自動 - Unknown + 不明 %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + 單聲道 + 立體聲 + 環繞音效 + 5.1 環繞音效 + 7.1 環繞音效 %1$.2f Mbps - %1$s, %2$s + %1$s、%2$s diff --git a/library/ui/src/main/res/values-zh-rTW/strings.xml b/library/ui/src/main/res/values-zh-rTW/strings.xml index ab8e38e9c3..9a5544b346 100644 --- a/library/ui/src/main/res/values-zh-rTW/strings.xml +++ b/library/ui/src/main/res/values-zh-rTW/strings.xml @@ -22,13 +22,13 @@ 文字 自動 - Unknown + 不明 %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + 單聲道 + 立體聲 + 環繞音效 + 5.1 環繞音效 + 7.1 環繞音效 %1$.2f Mbps - %1$s, %2$s + %1$s、%2$s